Translation updates for 1.2.1

487 files changed, 7344 insertions, 2571 deletions

diff --git a/i18n/cz/bluepin.ts b/i18n/cz/bluepin.ts
index e591d03..9952dfe 100644
--- a/i18n/cz/bluepin.ts
+++ b/i18n/cz/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Prosím zadejte pin</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Prosím zadejte PIN:</translation>
+        <translation type="obsolete">Prosím zadejte PIN:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Uložit pin</translation>
+        <translation type="obsolete">Uložit pin</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Odchozí připojení k</translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Příchozí spojení od</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/bluetooth-manager.ts b/i18n/cz/bluetooth-manager.ts
index f8eeace..749a471 100644
--- a/i18n/cz/bluetooth-manager.ts
+++ b/i18n/cz/bluetooth-manager.ts
@@ -1,339 +1,367 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Bluetooth Manager</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Název zařízení : &lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>MAC adresa:</translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Třída</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Test</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Změny byly aplikovány.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>prohledat služby</translation>
+        <translation type="obsolete">prohledat služby</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>do skupiny</translation>
+        <translation type="obsolete">do skupiny</translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>smazat</translation>
+        <translation type="obsolete">smazat</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Test1:</translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>žádné služby nenalezeny</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Žádná připojení nenalezena</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Zařízení</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Jméno zařízení</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Hledat zařízení</translation>
+        <translation type="obsolete">Hledat zařízení</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Připojení</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Typ připojení</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Signál</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Základní konfigurace Bluetooth</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Implicitní klíč</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>zapnutí autentizace</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>zapnutí šifrování</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation>Skenování vyvolávání</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation>Skenování dotazování</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Tabulka spojených Rfcomm</translation>
+        <translation type="obsolete">Tabulka spojených Rfcomm</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Značka stavu</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation>Základní konfigurace bluetooth</translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Jméno zařízení</translation>
+        <translation type="obsolete">Jméno zařízení</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Služby</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>změnit nastavení</translation>
+        <translation type="obsolete">změnit nastavení</translation>
     </message>
     <message>
         <source>active</source>
         <translation>aktivní</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>jméno služby</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Změna jména
+        <translation type="obsolete">Změna jména
 zařízení</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>Výchozí PIN</translation>
+        <translation type="obsolete">Výchozí PIN</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informace</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>TextLabel9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>připojit</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>připojit+konf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>odpojit</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>poslat soubory</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Který soubor by měl být odeslán?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Hledat zařízení</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Spustit hledání</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Přidat zařízení</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Zastavit hledání</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>připojení ppp</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>Zadejte název ppp skriptu:</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Připojit</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>připojit</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>připojit+konf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>odpojit</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Rfcomm spojení</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Spojit zařízení s rozhraním</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>Mac</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Kanál</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentář:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/calculator.ts b/i18n/cz/calculator.ts
index 764f36e..fa6a1e4 100644
--- a/i18n/cz/calculator.ts
+++ b/i18n/cz/calculator.ts
@@ -1,331 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Kalkulačka</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Váhy</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Prostor</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Teploty</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Hlasitost</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akry</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karáty</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cu cm</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektary</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tuny</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>námořní mi</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>body</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>sq cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>sq km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>sq m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>sq mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tuny</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnes</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/checkbook.ts b/i18n/cz/checkbook.ts
index ea87e95..19da01c 100644
--- a/i18n/cz/checkbook.ts
+++ b/i18n/cz/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Šeková knížka</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>nová knížka</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakce</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafy</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Zadejte jméno šekové knížky.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Vyberte typ šekové knížky.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Řadit podle:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Zde vyberete řazení v knížce.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Podle vstupu</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Číslo</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>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>
     </message>
     <message>
         <source>SortDate</source>
         <translation>SortDatum</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Číslo</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Částka</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilance</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </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>
     </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>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Bilance účtu</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Výběry dle kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Vklady dle kategorie</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Zadejte heslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosím zadejte vaše heslo:</translation>
     </message>
     <message>
         <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>
     </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>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Checkbook</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigurovat šekovou knížku</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavení</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Nový typ účtu</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Typy účtů</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nová kategorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Výdaj</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Výnos</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Příjemce</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nový příjemce</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Příjemci</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
     <message>
         <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>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkbook</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nová</translation>
     </message>
     <message>
         <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.
 
 Můžete také vybrat Nová z menu Šeková knížka.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>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>
     </message>
     <message>
         <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í.
 
 Můžete také vybrat Smazat v menu Šeková knížka.</translation>
     </message>
     <message>
         <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>
     </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>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Název Šekové knížky</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Zadejte heslo</translation>
     </message>
     <message>
         <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>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Úspory</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Ověřování</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Peněžní trh</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Podílový fond</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Jiný</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Výdaj</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Automobil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Účtenky</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CD nosiče</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Oblečení</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Počítač</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD nosiče</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Zábava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Jídlo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Palivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filmy</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Činže</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Cestování</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Plat</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Zaměstnání</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Člen rodiny</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Ostatní kredit</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakce pro</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Vklad</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Zde vyberete datum transakce.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Číslo:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Zde zadejte číslo paragonu.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Zde zadejte popis transakce.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Zde vyberte kategorii transakce.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>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>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Sem zadejte částku.
 
 Hodnota by měla být vždy kladná.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Poplatek:</translation>
     </message>
     <message>
         <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.
 
 Hodnota by měla být vždy kladná.</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Dlužní položka</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Napsaný šek</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Převod</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditní karta</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Automatická platba</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Hotovost</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/datebook.ts b/i18n/cz/datebook.ts
index 0d7ed92..7a99833 100644
--- a/i18n/cz/datebook.ts
+++ b/i18n/cz/datebook.ts
@@ -150,680 +150,692 @@ Chcete přesto skončit?</translation>
         <source>Sunday</source>
         <translation>Neděle</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Toto je každodenní událost.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikovat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Poslat tuto událost</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Zobrazení</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Výchozí zobrazení:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Týden</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Týdny</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Měsíc</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skočit na aktuální čas</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Řádkový styl:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Výchozí</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Střední</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velký</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Zobrazení času</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začátek-Konec</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavení alarmu</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Přednastavení alarmu</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začátek zobrazení událostí</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Čas začátku:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Výchozí</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalita:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Toto je každodenní událost.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Led-00. Led</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>PÚSČPSNP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikovat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Poslat</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Čas začátku</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Čas konce</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendář</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Opakovat...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Denně...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Týdně...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Měsíčně...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ročně...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neopakovat...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nová událost</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalita</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Schůzka</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Oběd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večeře</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Cesta</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začátek-Konec</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Led 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Čas začátku</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Každý den</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časové pásmo</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minut</translation>
+        <translation type="obsolete">minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tichý</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hlasitý</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Opakovat</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neopakovat...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Poznámka...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dny</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Upravit poznámku</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Oběd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začátek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 každý</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 každý</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation> %1 %1 každého</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Každé</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pondělí</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Úterý</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Středa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Čtvrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Pátek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Neděle</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Neopakovat</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dnů</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dny</translation>
     </message>
     <message>
         <source>day</source>
         <translation>den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>týdny</translation>
     </message>
     <message>
         <source>week</source>
         <translation>týden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>měsíc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 a </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, a </translation>
     </message>
     <message>
         <source>on </source>
         <translation>v </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nikdy</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Četnost</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez ukončení</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Neď</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>měsíce</translation>
     </message>
     <message>
         <source>years</source>
         <translation>roky</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/embeddedkonsole.ts b/i18n/cz/embeddedkonsole.ts
index 4e3df5a..aafc730 100644
--- a/i18n/cz/embeddedkonsole.ts
+++ b/i18n/cz/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Výběr příkazu</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Příkazy</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Příkazy&lt;/B&gt;:</translation>
     </message>
     <message>
         <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>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminál</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Seznam příkazů</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zelená na černé</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Černá na bílé</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bílá na černé</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zelená na žluté</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modrá na purpurové</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Purpurová na modré</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Azurová na bílé</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bílá na azurové</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modrá na černé</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Jantarová na černé</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Vlastní</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barvy</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Mezera</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Nahoru</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dolů</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Rychlá úprava</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>vlevo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>vpravo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Posuvník</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zalamovat</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Použít zvuky</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>Konsole</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Dole</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Nahoře</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Skryté</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Záložky</translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Černá na růžové</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Růžová na černé</translation>
     </message>
     <message>
         <source>default</source>
         <translation>výchozí</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>nová relace</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Písma</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Relace</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Celá obrazovka</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Lupa</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Upravit...</translation>
     </message>
     <message>
         <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>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>Řádek historie:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation>Konsole </translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Výběr příkazu</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <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>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/go.ts b/i18n/cz/go.ts
index 972c386..70f1a91 100644
--- a/i18n/cz/go.ts
+++ b/i18n/cz/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nová hra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Nehrát</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Vzdát</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Možnosti pro dva hráče</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Hra</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Bílý %1, Černý %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Bílý vyhrál.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Černý vyhrál.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Remíza.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Nehrál jsem</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Zajatci: černí %1, bílí %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/gutenbrowser.ts b/i18n/cz/gutenbrowser.ts
index b5f31ff..0ace73f 100644
--- a/i18n/cz/gutenbrowser.ts
+++ b/i18n/cz/gutenbrowser.ts
@@ -1,455 +1,459 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Upravit název</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Okno písma</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Stáhnout Index knihovny, nebo FTP místa?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation>Opravdu chcete stáhnout nejnovější
 index knihovny Projektu Gutenberg?
 nebo vybrat ftp místo?</translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Index knihovny</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;Ftp místo</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Hledání Etextu</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Prosím nainstalujte unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Knihovna Gutenberg</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Gutenbrowser</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Hledat v google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Upravit název</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Prosím nainstalujte unzip do vaší cesty</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Stahuji Gutenberg Index....</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Založeno na gutenbook.pl, k dispozici z http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Mnoho díků Lee Burgess,</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>za originální nápad a koncept gutenbook.</translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Seznam aktuálních Gutenberg ftp míst je na http://promo.net/pg/index.html</translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Pro hlášení chyb, komentáře, nebo otázky k Gutenbrowseru mailujte</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com</translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>
 Vyrobeno s použitím Qt, Qt Embedded, a Qtopia, cross platform vývojové API
 http://www.trolltech.com
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Arnoldovy zákony dokumentace:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Pokud by měla existovat, tak neexistuje.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Jestliže existuje, tak je zastaralá.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Jen dokumentace pro</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>nepoužitelné programy předstihne</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>první dva zákony.</translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>Vše je dočasné v každém případě....
  :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Otevřít soubor</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Zpět</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Vpřed</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Domů</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Jdi</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Záložky</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Zpět</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vpřed</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domů</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Index knihovny - požívá hlavní pg index.</translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation>Hledání hnihovny</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Stahuji Gutenberg Index....</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Titul</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <translation>G-M</translation>
     </message>
     <message>
         <source>N-R</source>
         <translation>N-R</translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation>S-Z</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Otevřít automaticky</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
-        <translation>Poslední jméno první 
+        <translation type="obsolete">Poslední jméno první 
 (vyžaduje restart knihovny)</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Chyba otevření index souboru knihovny. Prosím stáhněte nový.&lt;/P&gt; </translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>Stažení FTP</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Stahování by mělo brzy začít</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Odstranit Etext</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>Hle&amp;dat</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozlišovat velikost</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Výsledky hledání</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Stáhnout</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Stahuji ftp místa...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation>ftpmístoDlg</translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Nepodařilo se otevřít soubor seznamu.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Soubor není úspěšně otevřen.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Hlavní</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Gutenbrowser možnosti</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libaboutapplet.ts b/i18n/cz/libaboutapplet.ts
index 817ff2f..5a98e96 100644
--- a/i18n/cz/libaboutapplet.ts
+++ b/i18n/cz/libaboutapplet.ts
@@ -1,98 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>O aplikaci zkratka</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; je napsán a udržován Opie Teamem, celosvětovou sítí softwarových inženýrů zapojených do free softwarového vývoje.
 &lt;/p&gt;
 &lt;p&gt;
 Žádná skupina, firma, nebo organizace nemá v rukou zdrojový kód Opie. Každý, kdo chce přispívat do Opie, je vítán.
 &lt;/p&gt;
 &lt;p&gt;
 Pro více informaci o projektu Opie navštivte&lt;i&gt;http://opie.handhelds.org&lt;/i&gt;.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autoři</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Report</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Software může být vždy ještě lepší a team Opie je připraven to udělat. Ale Vy,- uživatel - nám musíte říci, pokud něco nefunguje, jak má, nebo může být uděláno lépe.&lt;/p&gt;
 &lt;p&gt;Open Palmtop Integrated Environment má systém na sledování chyb. Pro nahlášení chyb navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;
 &lt;p&gt;Jestliže máte nějaké návrhy na zlepšení, tak jste vítáni do našeho systému sledování chyb pro zaregistrování vašeho přání. Ujistěte se, že použijete kód závažnosti nazvaný &quot;Feature Wish&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Přidej se</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt; Nemusíte být vývojář software, abyste se stal členem Opie týmu. Můžete se přidat k národním týmům, které překládají uživatelské rozhraní programů. Můžete poskytnout grafiku, témata, zvuky a vylepšenou dokumentaci. Rozhodněte se!&lt;/p&gt;
 &lt;p&gt;Pro informace na kterých projektech můžete spolupracovat, navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;
 &lt;p&gt;Jestliže potřebujete více informací, nebo dokumentaci, tak navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Prostředí Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation>&lt;p&gt;
+        <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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</translation>
     </message>
+    <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;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libbatteryapplet.ts b/i18n/cz/libbatteryapplet.ts
index 4c68f9e..141d69e 100644
--- a/i18n/cz/libbatteryapplet.ts
+++ b/i18n/cz/libbatteryapplet.ts
@@ -1,87 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Závada</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nelze otevřít soubor</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>nejsou data</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Nabíjení obou zařízení</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Nabíjení</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Stav baterie:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dobrý</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Špatný</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Velmi špatný</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritický</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Na záložním napájení</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Připojeno k síti</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Externí zdroj odpojen</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Košilka</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Nebyla vložena košilka s baterií</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Zbývající energie: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Zbývající čas: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
-        <translation>Zbývající energie: %1 %2
+        <translation type="obsolete">Zbývající energie: %1 %2
 Zbývající čas: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
+    <message>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libliquid.ts b/i18n/cz/libliquid.ts
index 725738b..96a0649 100644
--- a/i18n/cz/libliquid.ts
+++ b/i18n/cz/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Kapalina</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Kapalina</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libmemoryapplet.ts b/i18n/cz/libmemoryapplet.ts
index 0f029b0..9d8c376 100644
--- a/i18n/cz/libmemoryapplet.ts
+++ b/i18n/cz/libmemoryapplet.ts
@@ -1,166 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Zatížení CPU aplikacemi (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Tato strana ukazuje vytížení procesoru tohoto zařízení.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Tato strana ukazuje obsazení paměti (RAM) vašeho zařízení.
 Paměť je kategorizována následovně:
 
 1. Used - paměť, kterou používá Opie a jiné běžící aplikace.
 2. Buffers - dočasné úložiště použité pro zvýšení výkonu
 3. Cached - informace, které byly nedávno použity, ale nebyly ještě uvolněny.
 4. Free - Volná paměť, kterou nepoužívá Opie, ani žádná jiná běžící aplikace.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Used (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Free (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Celkový Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Stav paměti</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Paměť</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Swap soubor</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Založeno na zdrojovém kódu:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Tento program je licencován pod GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Umístění swap souboru</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Karta CF</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Karta SD</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Zapnout</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Vypnout</translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation>Správa swap souboru</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Vytvořit</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation>Selhalo odpojení swap souboru.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Soubor swap deaktivován.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Nelze vytvořit swap soubor.</translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation>Nelze inicializovat swap soubor.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Swap soubor vytvořen.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Nelze odstranit swap soubor.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Swap soubor odstraněn.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Swap soubor aktivován.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 MB,4 MB,6 MB,8 MB,16 MB,32 MB,64 MB</translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libopiecore2.ts b/i18n/cz/libopiecore2.ts
index b223c02..9ba1299 100644
--- a/i18n/cz/libopiecore2.ts
+++ b/i18n/cz/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Tlačítko kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Tlačítko kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Tlačítko Záznam</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Horní+Nahoru</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Horní+Vlevo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Akční tlačítko</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Tlačítko End</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation>Tlačítko Todo</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Koš</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libopieobex.ts b/i18n/cz/libopieobex.ts
index 51cd9ab..b250a82 100644
--- a/i18n/cz/libopieobex.ts
+++ b/i18n/cz/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Přijato:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Akceptovat</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Odmítnout</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Přijmul jste typ souboru %1 (&lt;img src=&quot;%2&quot;&gt; )Co chcete udělat?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Odesílání:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Odesílání:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Hotovo</translation>
+        <translation type="obsolete">Hotovo</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDA není zapnuto!</translation>
+        <translation type="obsolete">IrDA není zapnuto!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Hledání IrDA zařízení.</translation>
+        <translation type="obsolete">Hledání IrDA zařízení.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth není k dispozici</translation>
+        <translation type="obsolete">Bluetooth není k dispozici</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Hledání bluetooth zařízení.</translation>
+        <translation type="obsolete">Hledání bluetooth zařízení.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Naplánováno pro odeslání.</translation>
+        <translation type="obsolete">Naplánováno pro odeslání.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klikněte pro poslání</translation>
+        <translation type="obsolete">Klikněte pro poslání</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Odesláno</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Selhání</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Pokus %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Hledat znovu IrDA.</translation>
+        <translation type="obsolete">Hledat znovu IrDA.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Zahájit odeslání</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libscreenshotapplet.ts b/i18n/cz/libscreenshotapplet.ts
index f04b62a..2c5be98 100644
--- a/i18n/cz/libscreenshotapplet.ts
+++ b/i18n/cz/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation>Zpoždění</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Uložit pojmenovaný</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Uložit sejmutí obrazovky jako...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Scap</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
-        <translation>Název sejmutí obrazovky</translation>
+        <translation type="obsolete">Název sejmutí obrazovky</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Úspěch</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Sejmutí obrazovky bylo nahráno na %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
         <translation>Připojení k %1 selhalo.</translation>
     </message>
     <message>
         <source>Opie drawpad</source>
         <translation>Opie drawpad</translation>
     </message>
     <message>
         <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
         <translation>Prosím nastavte systémovou proměnnou &lt;b&gt;QWS_DISPLAY&lt;/b&gt;.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libtodaydatebookplugin.ts b/i18n/cz/libtodaydatebookplugin.ts
index d3281d2..5000253 100644
--- a/i18n/cz/libtodaydatebookplugin.ts
+++ b/i18n/cz/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[s alarmem]</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Každý den</translation>
     </message>
     <message>
         <source>note</source>
         <translation>poznámka</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Zobrazovat místo</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Zaškrtněte, jestliže se má zobrazovat místo schůzky pro každou položku</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Zobrazovat poznámky</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Zaškrtněte, jestliže se má zobrazovat poznámka u schůzky ke každé položce</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Zobrazovat jen pozdější schůzky</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Zaškrtněte, jestliže se mají zobrazovat pouze budoucí schůzky</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Zobrazovat čas na zvláštním řádku</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Kolik schůzek má být maximálně zobrazeno. V chronologickém pořadí</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Kolik schůzek má být zobrazeno?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>jen dnešek</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>O kolik dnů se má zvětšit rozsah</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>O kolik dnů</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Datebook plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Dnes nejsou žádné další schůzky</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Dnes nejsou žádné schůzky</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/odict.ts b/i18n/cz/odict.ts
index e01650a..e3103b0 100644
--- a/i18n/cz/odict.ts
+++ b/i18n/cz/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Metoda vyhledávání</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Změnit</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Opie-Slovník</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Dotaz:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Slovník</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Nebyl definován slovník</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definujte jeden</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Storno</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Konfigurace</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Metody vyhledávání</translation>
+        <translation type="obsolete">Metody vyhledávání</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>Rozlišov&amp;at velikost</translation>
+        <translation type="obsolete">Rozlišov&amp;at velikost</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parametr</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Název:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Slovníkový soubor</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Prohlížet</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Jazyk 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Nerovnítko</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Jazyk 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nová metoda vyhledávání</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Změnit metodu vyhledávání</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/opieirc.ts b/i18n/cz/opieirc.ts
index 3e9371e..99c624d 100644
--- a/i18n/cz/opieirc.ts
+++ b/i18n/cz/opieirc.ts
@@ -3,721 +3,732 @@
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Přijímám soubor %1 od %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Úspěšně přijato %1</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Přerušeno</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Vzdálené přerušení</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation>Vypršel čas</translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>DCC přenosy jsou v běhu</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Přenosy jsou v běhu. &lt;br&gt;Pokud zavřete tuto záložku, tak budou přerušeny.&lt;br&gt;Chcete ji přesto zavřít?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Zavřít</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Nezavírat</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DCC přenos od %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 se vám pokouší poslat soubor %2
 (%3 bajtů)</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Akceptovat</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Odmítnout</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Konverzace na kanálu</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Diskuse na kanálu</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Sem pište zprávu pro přispění do diskuse na kanálu</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verze</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Odpojeno</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Připojeno, přihlašování ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Přihlášení úspěšné.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Chyba soketu :</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Spojení ukončeno</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Další záložka</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Předchozí záložka</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Zavřít záložku</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Přijatý neošetřený numerický příkaz: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Přijatý neošetřený ctcp příkaz: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Přijatý neošetřený znakový příkaz: %1</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Neexistující spojení kanálů - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 se připojil do kanálu %2</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Osoba je již na kanále připojena - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Už jste přihlášen na kanále -  rozsynchronizováno?</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Opustil jste kanál %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 opustil kanál %2</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Protější osoba zmizela - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Kanál pro diskuzi nebyl nalezen - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Kanálová zpráva s neznámým odesílatelem</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanálová zpráva s neznámým kanálem %1</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Přijata PRIVMSG neznámého typu</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 odešel (%2)</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Neznámý odchod osoby - rozsynchronizováno?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>Změněno téma na</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Neznámé téma kanálu - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Přijatý CTCP PING od</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION s neznámou osobou - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION s neznámým kanálem - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION se špatným příjemcem</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Změna režimu je neznámého typu</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Změna režimu s neznámou osobou - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Změna režimu s neznámým příznakem</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Změna režimu s neznámým kanálem - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Uživatelské režimy ještě nejsou podporovány</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Byl jste vykopnut z</translation>
     </message>
     <message>
         <source> by </source>
         <translation>od</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>vykopnut z</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Vykopnutí neznámé osoby - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Neznámé kanálové vykopnutí - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serverová zpráva s neznámým kanálem</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Připojil jste se ke kanálu</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Přezdívka se již používá, prosím připojte se znovu s jinou</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Přezdívka nezadána</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Server %1 verze %2 podporuje uživ. režimy &apos;%3&apos; a kanálové režimy &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Je zde připojeno %1 operátorů</translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation>Je zde %1 neznámých připojení</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>Je zde zformováno %1 kanálů</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Prosím chvíli počkejte a zkuste to znovu</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Skutečné jméno: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 používá server %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 je na kanálech: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Jména pro %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Čas na serveru %1 je %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Kanál, nebo přezdívka %1 neexistuje</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Chybí zde informace historie pro %1</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Neznámý příkaz: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Nelze změnit přezdívku na %1: %2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Nejste na kanálu %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] Operace není povolena, nemáte dostatečná práva na kanálu</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Připojeno k</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 nic nedělá už %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation>%1 přihlášen na %2</translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING s neznámou osobou - Rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING s neznámým kanálem - Rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP PING se špatným příjemcem</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>Přijata CTCP VERSION žádost od</translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>Přijata odpověď na CTCP PING od %1: %2 sekund</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>Přijata žádost na CTCP PING od %1</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Zdeformována DCC žádost od %1</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Uložit jako</translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Rozhovor s</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Privátní diskuse</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Sem pište text, který chcete odeslat druhé osobě</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Odpojeno</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Název profilu :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Název tohoto profilu serveru ve zkratce</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostitel :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Server pro připojení - může to být platné jméno, nebo IP adresa</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Port serveru pro připojení. Obvykle 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Přezdívka :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Vaše přezdívka na IRC síti</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Skutečné jméno: </translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Vaše skutečné jméno</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Heslo :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Heslo pro připojení k serveru (pokud je vyžadováno)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanály :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Seznam kanálů, které chcete automaticky připojit, oddělených čárkami</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Upravit informace o serveru</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Název profilu je vyžadován</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Název hostitele je vyžadován</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Přezdívka se vyžaduje</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>Seznam kanálů musí obsahovat
+        <translation type="obsolete">Seznam kanálů musí obsahovat
 jejich názvy oddělené čárkami
 a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Prohlížeč seznamu serverů</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Prosím vyberte profil serveru</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Vyberte profil serveru a potom klikněte na OK v pravém horním rohu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Smazat označený profil serveru</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Upravit označený profil serveru</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Přidat nový profil serveru</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Zprávy serveru</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Zde pište příkazy. Seznam příkazů je v nápovědě k OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Připojování k</translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Přejmenoval jste se na %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Změna přezdívky neznámé osoby</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 se přejmenoval na %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation>Zobrazeno řádek :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Počet řádek, které se mají zobrazit, než se staré řádky smažou - toto je nutné pro omezení spotřeby paměti. Nastavte na 0, pokud to nepotřebujete</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Hlavní</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Barva pozadí :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Barva pozadí použitá při diskuzích</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Barva normálního textu :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Barva textu použitá při diskuzích</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Chybová barva :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Barva textu použitá při zobrazování chyb</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Text napsaný vámi :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Barva textu, která se používá pro identifikaci vašeho textu</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Text napsaný ostatními :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Barva textu použitá pro identifikaci textu napsaného ostatními</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Text napsaný serverem :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Barva textu použitá pro identifikaci textu napsaného serverem</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Sdělení :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Barva textu použitá při zobrazování sdělení</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barvy</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Zobrazit čas v chat logu</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Klávesové zkratky</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Bez popisu</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Popis obsahu záložky</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Zavřít tuto záložku</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC klient</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serverová připojení, kanály, dotazy a další věci budou umístěny zde</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nové připojení</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Vytvořit nové připojení k IRC serveru</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Konfigurujte vzhled a chování OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation>Opie IRC</translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>dát stav operátora kanálu</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>vzít stav operátora kanálu</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>dát hlas komu</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>vzít hlas komu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/sysinfo.ts b/i18n/cz/sysinfo.ts
index 78a195f..53f755e 100644
--- a/i18n/cz/sysinfo.ts
+++ b/i18n/cz/sysinfo.ts
@@ -1,365 +1,380 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Tato oblast zobrazuje možné testy, výsledky testů, které byly provedeny a hodnoty pro porovnání pro vybrané zařízení. Zaškrtněte testy, které chcete provést.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Testy</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Výsledky</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Porovnání</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Celočíselná aritmetika  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Výpočty s plovoucí čárkou  </translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Zobrazování textu  </translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Zobrazování grafiky  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Rychlost paměti RAM  </translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Rychlost SD karty  </translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Rychlost CF karty  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Start Testů!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klikněte sem pro provedení vybraných testů.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Vyberte model pro porovnání s vašimi výsledky.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>chyba</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na Compact Flash paměťové kartě.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na pevném disku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na Secure Digital paměťové kartě.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito v interní (flash) paměti na tomto zařízení.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na dočasném RAM disku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Zatížení CPU aplikacemi (%)</translation>
+        <translation type="obsolete">Zatížení CPU aplikacemi (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Zatížení CPU systémem (%)</translation>
+        <translation type="obsolete">Zatížení CPU systémem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Tato stránka ukazuje vytížení procesoru zařízení.</translation>
+        <translation type="obsolete">Tato stránka ukazuje vytížení procesoru zařízení.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Typ:</translation>
+        <translation type="obsolete">Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Tato stránka ukazuje, kolik RAM paměti je alokováno.
 Pamět je rozdělena do těchto kategorií:
 
 1. Použitá - paměť použitá systémem Opie a jinými běžícími aplikacemi.
 2. Buffery - dočasný prostor použitý pro zvýšení výkonu
 3. Cache - informace, které se nedávno použily, ale nebyly ještě uvolněny.
 4. Volná - paměť, která není momentálně ničím nevyužitá.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použitá (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffery (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Volná (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Celkový swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Použití#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Používá</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Toto je seznam modulů do jádra systému, které jsou momentálně nahrány.
 
 Klikněte a podržte na modulu, pokud se chcete dozvědět více, nebo modul uvolnit.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Zde vyberete příkaz a potom kliknete na tlačítko Poslat pro poslání příkazu vybranému modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Sem klikněte pro poslání vybraného příkazu modulu označenému výše.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Tato oblast zobrazuje detailní informace o tomto modulu.</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Opravdu chcete spustit 
 %1 na tento modul?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použito (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Volno (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Příkaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Toto je seznam všech procesů na tomto zařízení.
 
 Klikněte a podržte na procesu, pokud o něm chcete detailní informace, nebo mu chcete poslat signál.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Zde vyberte signál a klikněte na tlačítko Poslat pro poslání signálu tomuto procesu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Sem klikněte pro odeslání vybraného signálu tomuto procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Tato oblast zobrazuje detailní informace o tomto procesu.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Opravdu chcete poslat %1
 tomuto procesu?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informace o systému</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Paměť</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Úložný prostor</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verze</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Výkonnostní testy</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Syslog</translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verze: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiloval: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Verze: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Sestaveno: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verze: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Model: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Dodavatel: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Tato stránka ukazuje aktuální verzi Opie, linuxového jádra a distribuce běžící na tomto kapesním zařízení.</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation>Sestaveno proti Qt/E </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/today.ts b/i18n/cz/today.ts
index c37285d..f38ed1c 100644
--- a/i18n/cz/today.ts
+++ b/i18n/cz/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation>Vlastník</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosím vyplňte vizitku</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klikněte pro spuštění přidružené aplikace</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nejsou aktivovány žádné pluginy</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Today Chyba</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Plugin &apos;%1&apos; způsobil havárii Today. Je možné, že plugin není řádně nainstalován.&lt;br&gt;Today zkusí pokračovat v nahrávání pluginů.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Today napsal Maximilian Reiß</translation>
+        <translation type="obsolete">Today napsal Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Zde klikněte pro okno s nastavením</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Konfigurace Today</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>V jakém pořadí nahrát jaké pluginy:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Pro aktivaci pluginu jej zaškrtněte, nebo použijte šipky na pravé straně pro změnu pořadí spouštění</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Posunout dolů</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktivní/pořadí</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Ostatní</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Zaškrtněte, pokud se má Today automaticky spustit po probuzení.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>Spustit po probuzení?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>malý banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Požít malý banner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Kolik minut má být PDA uspáno předtím, než ho funkce automatické spuštění probudí</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minut neaktivní</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>bod</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Nastavte velikost ikon v bodech</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>velikost ikon</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nikdy</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Jak často se má Today obnovovat</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>obnovení</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/zsafe.ts b/i18n/cz/zsafe.ts
index 3066ae8..43ed9a9 100644
--- a/i18n/cz/zsafe.ts
+++ b/i18n/cz/zsafe.ts
@@ -1,579 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informace:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nová položka</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Filtr typu souborů</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Rámeček filtru typu souborů
 
 upravit nebo vybrat filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Potvrdní výběr a zavře formulář</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Tlačítko OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>stornuje výběr a zavře formulář</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Tlačítko Storno</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>Zobrazí vybraný název souboru</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Řádka s názvem souboru
 
 zobrazí vybraný soubor
 a umožní přímou úpravu názvu
 souboru</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Rámeček adresář
 úprava, nebo výběr názvu adresáře</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>size</source>
         <translation>velikost</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>seznam adresářů</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Seznam Adresářů
 
 zobrazí seznam adresářů a souborů</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>adresář</translation>
     </message>
     <message>
         <source>file</source>
         <translation>soubor</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Prosím čekejte...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Nový dokument</translation>
+        <translation type="obsolete">&amp;Nový dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Otevřít dokument</translation>
+        <translation type="obsolete">&amp;Otevřít dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Uložit dokument jako..</translation>
+        <translation type="obsolete">&amp;Uložit dokument jako..</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Uložit dokument</translation>
+        <translation type="obsolete">&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>
+        <translation type="obsolete">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>
+        <translation type="obsolete">&amp;Export do textového souboru</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Import z textového souboru</translation>
+        <translation type="obsolete">&amp;Import z textového souboru</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>&amp;Odstranit textový soubor</translation>
+        <translation type="obsolete">&amp;Odstranit textový soubor</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Otevřít položky rozvinuté</translation>
+        <translation type="obsolete">&amp;Otevřít položky rozvinuté</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>K&amp;onec</translation>
+        <translation type="obsolete">K&amp;onec</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Soubor</translation>
+        <translation type="obsolete">&amp;Soubor</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nový</translation>
+        <translation type="obsolete">&amp;Nový</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Upravit</translation>
+        <translation type="obsolete">&amp;Upravit</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Smazat</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Vyjmout</translation>
+        <translation type="obsolete">&amp;Vyjmout</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>K&amp;opírovat</translation>
+        <translation type="obsolete">K&amp;opírovat</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Vložit</translation>
+        <translation type="obsolete">&amp;Vložit</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Hledat</translation>
+        <translation type="obsolete">&amp;Hledat</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Položka</translation>
+        <translation type="obsolete">&amp;Položka</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;O aplikaci</translation>
+        <translation type="obsolete">&amp;O aplikaci</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Nápověda</translation>
+        <translation type="obsolete">&amp;Nápověda</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Nová položka</translation>
+        <translation type="obsolete">Nová položka</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Upravit kategorii, nebo položku</translation>
+        <translation type="obsolete">Upravit kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Smazat kategorii, nebo položku</translation>
+        <translation type="obsolete">Smazat kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Hledat položku</translation>
+        <translation type="obsolete">Hledat položku</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Opravdu chcete smazat?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>N&amp;emazat</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Název položky musí být jiný
 než název kategorie.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Položka nenalezena</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Všechno</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Odstranit textový soubor</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nelze odstranit textový soubor.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Dokument nebyl definován.
 Vytvořte nový dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Export do textového souboru</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Import z textového souboru</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nelze exportovat do textového souboru.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nelze importovat textový soubor.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Zadejte heslo</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Špatné heslo.
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Špatné heslo.
 Zkusit znovu?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Ne.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Prázdný dokument,
 nebo špatné heslo.
 Pokračovat?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ano.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Heslo je prázdné.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Opakujte heslo</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Hesla musí být identická.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Chcete uložit změny</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 před pokračováním?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Uložit</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Neukládat</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Soubor s hesly uložen.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Chcete uložit změny
 před ukončením?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>U&amp;ložit s
 novým
 heslem</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Čekejte</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Shromažďování ikon...</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Nyní prosím zadejte
 dvakrát heslo k vašemu
 nově vytvořenému dokumentu.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Otevřít ZSafe dokument</translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nelze vytvořit adresář %1&lt;/P&gt;&lt;P&gt;ZSafe se nyní ukončí.&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZSafe: </translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nebyl definován dokument. Měli byste vytvořit nový&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Musíte nejdříve vytvořit nový dokument. Vytvořit?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus správce hesel&lt;br&gt;ZSafe verze 2.1.2&lt;br&gt;&lt;/b&gt;vytvořil Carsten
+        <translation type="obsolete">&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus správce hesel&lt;br&gt;ZSafe verze 2.1.2&lt;br&gt;&lt;/b&gt;vytvořil Carsten
 Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Přeložil Robert
 Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>Kopírovat do schránky</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Zobrazit Info</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/bluepin.ts b/i18n/da/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/da/bluepin.ts
+++ b/i18n/da/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/bluetooth-manager.ts b/i18n/da/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/da/bluetooth-manager.ts
+++ b/i18n/da/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/calculator.ts b/i18n/da/calculator.ts
index 44c5f38..78726db 100644
--- a/i18n/da/calculator.ts
+++ b/i18n/da/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Lommeregner</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/checkbook.ts b/i18n/da/checkbook.ts
index 04e011f..956d4b5 100644
--- a/i18n/da/checkbook.ts
+++ b/i18n/da/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nyt checkhæfte</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transaktioner</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Diagrammer</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beskyttet med kodeord</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik her for at slå beskyttelse med kodeord til eller fra.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Skriv navnet på checkhæftet her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Vælg checkhæfte-typen her.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Skriv checkhæftets banks navn her.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Kontonummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Skriv kontonummer for checkhæftet her.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN kode:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Skriv checkhæftets pinkode her.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Skriv checkhæftets startsaldo her.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Skriv yderligere informationer for checkhæftet her.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Dette er en liste med alle checkhæftets transaktioner.
 
 For at sortere efter en kolonne, klik på kolonnens navn.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Beløb</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik her for at tilføje en ny transaktion.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Vælg en transaktion, og klik her for at redigere den.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Vælg et checkhæfte og klik her for at slette det.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Vælg det ønskede diagram herunder, og klik på Tegn-knappen.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik her for at vælge diagram-typen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontoens saldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Udtrækninger efter kategori</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Indsættelser efter kategori</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Tegn</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik her for at tegne det valgte diagram.</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv venligst dit kodeord:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bekræft kodeord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bekræft dit kodeord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Skriv dit kodeord for at bekræfte, at du vil slå kodeordsbeskyttelse fra:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Slet transaktion</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigurer Checkhæfte</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Skriv valutasymbol:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Skriv symbolet for den lokale valuta her (fx. kr).</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Vis om checkhæftet er beskyttet med
 kodeord</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klik her for at vælge, om hovedvinduet skal vise, om checkhæftet er beskyttet med kodeord.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Vis checkhæfte-saldi</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik her for at vælge om hoved-vinduet skal vise den nuværende saldo for hver checkhæfte.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik her for at oprette et nyt checkhæfte.
 
 Du kan også vælge Nyt fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Vælg et checkhæfte, og klik her for at redigere det.
 
 Du kan også vælge Rediger fra Checkhæfte-menuen, eller klikke og holde nede på et checkhæftes navn.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Vælg et checkhæfte, og klik her for at slette det.
 
 Du kan også vælge Slet fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik er for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dette er en liste over tilgængelige checkhæfter.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Checkhæfte-navn</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv dit kodeord:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Slet checkhæfte</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Rediger</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Ny</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Opsparinger</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Regninger</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Pengemarkedet</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fælleskapital</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Andet</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Bil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Regninger</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CD&apos;er</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Tøj</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD&apos;er</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Elektronik</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Underholdning</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Mad</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Benzin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Diverse</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Leje</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Rejser</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Arbejde</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Familiemedlem</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Diverse kredit</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaktion for</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Udtrækning</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Vælg om transaktionen er et udtræk eller en indsættelse.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Indsættelse</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Dato:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Vælg transaktionens dato her.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummber:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Skriv check-nummer her.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Skriv en beskrivelse af transaktionen her.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Vælg en transaktions-kategori her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Vælg transaktionstypen her.
 
 De tilgængelige valgmuligheder er ud fra om det er en indsætning eller en udtrækning.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Beløb:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Skriv beløbet her.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Skriv eventuelt gebyr for transaktionen.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Skriv evt. ekstra informationer om transaktionen her.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Udskrevet check</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Overførsel</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditkort</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Automatisk betaling</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Kontant</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 4ec555d..ed5457f 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -151,680 +151,692 @@ Afslut alligevel?</translation>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished">Tid</translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Send denne begivenhed</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start visning af begivenheder</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Start tid:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarm indstillinger</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarm forvalg</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Række stil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Visninger</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Standard visning:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Ugeliste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Gå til dags dato</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Klokketslet for</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Start-slut</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standardindstillinger</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Sted:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">MTOTFLSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Rediger</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Kopier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Send</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>U: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Start tid</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Slut tid</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Gentag...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagligt...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Ugentligt...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Månedetligt...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Årligt...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Ny begivenhed</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Møde</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Frokost</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Middag</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Rejse</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Slut</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Start tid</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tidszone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> minutter</translation>
+        <translation type="obsolete"> minutter</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Lydløs</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Gentag</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Bemærkning...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dage</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Rediger bemærkning</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Frokost</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>D. %1 hver </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>D. %1 %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Gentag hver</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>måned(er)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>år</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation>uge</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source> and </source>
         <translation> og </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 og </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, og </translation>
     </message>
     <message>
         <source>on </source>
         <translation>på</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Slut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Gentagelse aktiveret</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>måneder</translation>
     </message>
     <message>
         <source>years</source>
         <translation>år</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/embeddedkonsole.ts b/i18n/da/embeddedkonsole.ts
index c2149ad..f12769e 100644
--- a/i18n/da/embeddedkonsole.ts
+++ b/i18n/da/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Kommando valg</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Kommandoer</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Kommandoer&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Foreslåede kommandoer&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Kommando liste</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Vis kommando liste</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skjul kommando liste</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Grøn på sort</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Sort på hvidt</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Hvidt på sort</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Grøn på gul</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blå på lilla</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Lilla på blå</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Turkis på hvid</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Hvid på turkis</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blå på sort</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Orange på sort</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Tilpasset</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farver</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Mellemrum</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Op</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Sæt ind</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hurtig redigering</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Rullebjælke</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Ombrydning</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Brug bip</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Vis kommando liste</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skjul kommando liste</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Kommando valg</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Tilføj kommando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Indtast kommando der skal tilføjes:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/go.ts b/i18n/da/go.ts
index 1be6e7c..2b7017a 100644
--- a/i18n/da/go.ts
+++ b/i18n/da/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nyt spil</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Hvid %1, Sort %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Hvid vinder.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Sort vinder.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Uafgjort.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Fanger: Sort %1, hvid %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/gutenbrowser.ts b/i18n/da/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/da/gutenbrowser.ts
+++ b/i18n/da/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libaboutapplet.ts b/i18n/da/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/da/libaboutapplet.ts
+++ b/i18n/da/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index 78c6bc4..f4d5b52 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Oplader</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batteri status: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>God</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisk</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>På backup strøm</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Strøm on-line</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Ekstern strøm afbrudt</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>kunne ikke åbne fil</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libliquid.ts b/i18n/da/libliquid.ts
index 0a2fe89..471b37e 100644
--- a/i18n/da/libliquid.ts
+++ b/i18n/da/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libmemoryapplet.ts b/i18n/da/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/da/libmemoryapplet.ts
+++ b/i18n/da/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libopiecore2.ts b/i18n/da/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/da/libopiecore2.ts
+++ b/i18n/da/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libopieobex.ts b/i18n/da/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/da/libopieobex.ts
+++ b/i18n/da/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libscreenshotapplet.ts b/i18n/da/libscreenshotapplet.ts
index ded2f36..b32ed89 100644
--- a/i18n/da/libscreenshotapplet.ts
+++ b/i18n/da/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/da/libtodaydatebookplugin.ts
index 5dcc78e..93ceeb7 100644
--- a/i18n/da/libtodaydatebookplugin.ts
+++ b/i18n/da/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[med alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>notat</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dagen</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Vis sted</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Vælg dette, hvis stedet for hver aftale skal vises</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Vis notater</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Vælg dette. hvis notater for hver aftale skal vises</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Vis kun aftaler i fremtiden</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Vælg dette, hvis kun aftaler &quot;senere end nu&quot; skal vises</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Hvis tidspunkt i en linje for sig selv</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Hvor mange aftaler skal der højest vises? (I kronologisk rækkefølge.)</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Hvor mange aftaler skal der vises?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>kun idag</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Hvor mange ekstra dage</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Kalender plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Ikke flere aftaler idag</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Ingen aftaler idag</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/odict.ts b/i18n/da/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/da/odict.ts
+++ b/i18n/da/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opieirc.ts b/i18n/da/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/da/opieirc.ts
+++ b/i18n/da/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/da/sysinfo.ts
index c597f6e..966c807 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -1,357 +1,372 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Compact Flash hukommelses kort.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget lager der iøjeblikket er i brug på denne harddisk.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Secure Digital hukommelses kort.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Program CPU forbrug (%)</translation>
+        <translation type="obsolete">Program CPU forbrug (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>System CPU forbrug (%)</translation>
+        <translation type="obsolete">System CPU forbrug (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Denne side viser hvor meget af denne enheds processor er i brug.</translation>
+        <translation type="obsolete">Denne side viser hvor meget af denne enheds processor er i brug.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Type: </translation>
+        <translation type="obsolete">Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffere (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Hukommelse ialt: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Brug#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dette er en liste af alle de kernel moduler der iøjeblikket er indlæst på denne håndholdte enhed.
 
 Klik og hold på et modul for at se yderligere information om modulet eller for at fjerne det.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Vælg en kommando her og klik på Send knappen til højre for at sende kommandoen til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik her for at sende den valgte kommando til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dette område viser detaljeret information om dette modul.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dette er en liste over alle processer på denne håndholdte enhed.
 
 Klik og hold på en proces for at se yderligere information om processen eller for at sende et signal til den.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Vælg et signal her og klik på Send-knappen til højre for at sende til denne proces.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik her for at sende det valgte signal til denne proces.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dette område viser detaljeret information omkring denne proces.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>System Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Hukommelse</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Lager</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kerne&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompileret af: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Bygget den: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Denne side viser de nuværende versioner af Opie, Linux kernen og distributionen der kører på denne håndholdte enhed.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index d908ab9..1e730aa 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Idag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Ejes af </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Udfyld venligst visitkortet</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik her for at starte det tilknyttede program</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ingen plugins aktiveret</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Idag af Maximilian Reiß</translation>
+        <translation type="obsolete">Idag af Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik her for at gå til indstillingerne</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Hent hvilke plugins i hvilken rækkefølge:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Flyt Op</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Flyt Ned</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Aktiv/Rækkefølge</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Afkryds feltet for at aktivere/deaktivere et plugin eller brug piletasterne til højre for at ændre rækkefølgen de bliver vist</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Idag konfiguration</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autostart ved opvågning?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>minibanner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Minibanner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>Minutter inaktiv</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixels</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Indstil størrelsen på ikonet i pixels</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>Ikonstørrelse</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>aldrig</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Hvor ofte Idag skal genopfriske sig selv</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>genopfrisk</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/zsafe.ts b/i18n/da/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/da/zsafe.ts
+++ b/i18n/da/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/bluepin.ts b/i18n/de/bluepin.ts
index a2bcac6..3cb38c7 100644
--- a/i18n/de/bluepin.ts
+++ b/i18n/de/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Bitte PIN eingeben</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Bitte PIN eingeben:</translation>
+        <translation type="obsolete">Bitte PIN eingeben:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>PIN speichern</translation>
+        <translation type="obsolete">PIN speichern</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>Abbre&amp;chen</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Ausgehende Verbindung zu</translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Ankommende Verbindung von </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/bluetooth-manager.ts b/i18n/de/bluetooth-manager.ts
index 7f8801a..8f6df54 100644
--- a/i18n/de/bluetooth-manager.ts
+++ b/i18n/de/bluetooth-manager.ts
@@ -1,340 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Bluetooth Manager</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Gerätename: &lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>MAC-Addresse: </translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Klasse</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Test</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Änderungen wurden durchgeführt.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>Dienste neu scannen</translation>
+        <translation type="obsolete">Dienste neu scannen</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>an Gruppe </translation>
+        <translation type="obsolete">an Gruppe </translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>löschen</translation>
+        <translation type="obsolete">löschen</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Test1:</translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>Keine Dienste gefunden</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Keine Verbindung gefunden</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Geräte</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Gerätenname</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Verbunden</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Nach Geräten suchen </translation>
+        <translation type="obsolete">Nach Geräten suchen </translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Verbindungen</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Verbindungsart</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Signal</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Bluetooth Basiskonfiguration</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Defaultschlüssel</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>Authentisierung anschalten</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>Verschlüsselung anschalten</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation>Seitensuche aktivieren</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation>Abfragesuche aktivieren</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Rfcomm Bind Table</translation>
+        <translation type="obsolete">Rfcomm Bind Table</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Statuslabel</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation>Bluetooth Basiskonfiguration</translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Gerätename</translation>
+        <translation type="obsolete">Gerätename</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>Einstellungen ändern</translation>
+        <translation type="obsolete">Einstellungen ändern</translation>
     </message>
     <message>
         <source>active</source>
         <translation>aktiv</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>Dienstename</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Gerätename
+        <translation type="obsolete">Gerätename
 ändern</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>Default PIN
+        <translation type="obsolete">Default PIN
 Code</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>TextLabel9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>connect</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>connect+conf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>connect+conf</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>Dateien beamen</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Welche Datei soll gebeamt werden ?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Nach Geräten suchen</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Suche starten</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Gerät hinzufügen</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Suche stoppen</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>PPP Verbindung</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>PPP-Script angeben: </translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Verbindung</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>connect</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>connect+conf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>disconnect</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Rfcomm Bind</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Gerät an eine Schnittstelle binden</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>Mac</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar: </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/calculator.ts b/i18n/de/calculator.ts
index 6059c24..27584e3 100644
--- a/i18n/de/calculator.ts
+++ b/i18n/de/calculator.ts
@@ -1,332 +1,340 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Taschenrechner</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht
 </translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distanz</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Radial</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatur</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karat</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm³</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>inch³</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>foot</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektar</translation>
     </message>
     <message>
         <source>in</source>
         <translation>inch</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>pfund</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>long tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mile</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>Seemeilen</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>unze</translation>
     </message>
     <message>
         <source>points</source>
         <translation>points</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pint</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>quart</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm²</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>ft²</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>inch²</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km²</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m²</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mile²</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm²</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>yard²</translation>
     </message>
     <message>
         <source>st</source>
         <translation>stone</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>short tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>Esslöffel</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>Teelöffel</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnen</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yard</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/checkbook.ts b/i18n/de/checkbook.ts
index dcbd041..640c000 100644
--- a/i18n/de/checkbook.ts
+++ b/i18n/de/checkbook.ts
@@ -1,639 +1,647 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kontobuch</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transaktionen</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Auswertung</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geben Sie hier den Namen des Kontos ein.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Wählen Sie hier den Typ des Kontos.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank: </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Geben Sie den Namen des Kontos hier ein.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Kontonummer: </translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Geben Sie hier die Kontonummer für dieses Konto hier ein.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN: </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Geben Sie hier die PIN für dieses Konto ein.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startguthaben: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Geben Sie hier das Startguthaben dieses Kontos ein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Geben Sie hier zusätzliche Notizen ein.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Dies ist eine Liste aller Transaktionen dieses Kontos.
 Um Einträge nach einem Feld zu sortieren klicken Sie auf den Spaltennamen.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Menge</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klicken Sie hier um eine neue Transaktion anzulegen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Wählen Sie eine Transaktion und klicken Sie hier um sie zu bearbeiten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Wählen sie ein Konto und klicken Sie hier um es zu löschen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Wählen Sie den gewünschten Graphen und klicken Sie den &lt;b&gt;Zeichnen&lt;/b&gt;-Schalter.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Wählen Sie hier den gewünschten Graphen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Ausgaben n. Kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Einnahmen n. Kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Zeichnen</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klicken Sie hier um den gewünschten Graphen zu erstellen.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Transaktion löschen</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Passwortschutz</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klicken Sie hier um den Passwortschutz für dieses Konto zu aktivieren oder zu deaktivieren.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Geben Sie ein Passwort ein</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitte geben Sie ein Passwort ein: </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bestätigen Sie das Passwort</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bitte bestätigen Sie das Passwort:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Bitte geben Sie das Passwort ein um die Aufhebung des Passwortschutzes zu bestätigen:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sortiert nach:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Wählen Sie hier die Sortierung des Scheckbuches.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Eintragsreihenfolge</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Sortierdatum</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Kontostand</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Kontokonfiguration</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geben Sie das Währungssymbol ein:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geben Sie Ihr lokales Währungssymbol hier ein.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Anzeigen der Passwortschutzfunktion</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klicken Sie hier, um den Passwortschutz im Hauptfenster anzuzeigen.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Anzeige der Kontostände</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klicken Sie hier, um die Anzeige der Kontostände der einzelnen Konten im Hauptfenster angezeigt werden sollen.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Neuer Account Typ</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Account Typen</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Aufwand</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Einkommen</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorien</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Empfänger</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Neuer Empfänger</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Empfänger</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Letztes Konto öffnen</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Hier Klicken um auszuwählen, ob das letztbearbeitete Konto beim Start geöffnet werden soll.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Letzten Kontoreiter anzeigen</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Hier klicken um auszuwählen, ob der letzte Reiter eines Kontos angezeigt werden soll.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Neue Beschreibung als Empfänger speichern</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Klicken Sie hier, um die neue Beschreibung in der Liste der Empfänger zu speichern.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klicken Sie hier, um ein neues Konto anzulegen.
 Sie können auch &lt;b&gt;Neu&lt;/b&gt; aus dem Konto-Menü wählen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Berabeiten</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Wählen Sie ein ein Konto und klicken Sie hier um es zu bearbeiten.
 Sie können auch &lt;b&gt;Bearbeiten&lt;/b&gt; aus dem Konto-menü wählen oder mit dem Stift auf einen Kontobuch dücken und ihn kurz dort halten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wählen Sie ein Konto und klicken Sie hier um es zu löschen.
 Sie können auch &lt;b&gt;Löschen&lt;/b&gt; aus dem Konto-menü wählen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dies ist eine Auflistung aller verfügbaren Konten.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Konto löschen</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kontoname</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Passwort-Eingabe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitt geben Sie Ihr Passwort ein:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Ersparnisse</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Rechnung</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Anlagefont</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Andere</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Aufwand</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rechnungen</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleidung</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronik</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Unterhaltung</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Nahrungsmittel</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Kraftstoff</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filme</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Miete</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Einkommen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familienmitgiled</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Kreditsache</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaktion für </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Wählen Sie hier ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Einnahme</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum: </translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Wählen Sie das Transaktionsdatum hier.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer: </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Geben Sie hier die Nummer ein.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beschreibung: </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Geben Sie hier die Beschreibung der Transaktion ein.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Wählen Sie die Transaktionskategorie  hier.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Wählen Sie den Transaktionstyp hier.
 Die verfügbaren Optionen hängen davon ab, ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Menge: </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Geben Sie den Wert der Transaktion hier an.
 Der eingegebene sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebühr: </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Geben Sie eine Gebühr ein, die mit dieser Transaktion in Verbindung steht.
 Der Wer der Gebühr sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Geben Sie heir weitere Informationen ein.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Abzahlung</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Scheck</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditkarte</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Bankeinzug</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Bar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 4f26e69..2dac7ab 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -143,689 +143,701 @@ Trozdem beenden?</translation>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Eintrag ist ganztägig.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Dieses Vorkommen Senden</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voreinstellungen</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Erster anzuzeigender Termin</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Startzeit:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarmeinstellungen</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvorwarnzeit</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Unterschiedliches</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Spaltenstil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Ansichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Defaultansicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Wochenliste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Sprung zu &quot;jetzt&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Zeitanzeige</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Beginn-Ende</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Termin ist ganztägig.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MDMDFSSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>P</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Wiederholung...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Täglich...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wöchentlich...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Monatlich...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jährlich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>endet um</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Abendessen</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>Minuten</translation>
+        <translation type="obsolete">Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Bescheibung</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notizen...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">Tage</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Notiz bearbeiten</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Mittagessen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Den %1. %2. in jedem </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Am %1. jeden </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Den %1. %1. jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>on </source>
         <translation>am</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Zu wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholen am</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WochenVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
         <source>years</source>
         <translation>Jahre</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/embeddedkonsole.ts b/i18n/de/embeddedkonsole.ts
index 2f1ae3e..7651d88 100644
--- a/i18n/de/embeddedkonsole.ts
+++ b/i18n/de/embeddedkonsole.ts
@@ -1,252 +1,256 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Befehle</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Befehle&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Vorgeschlagene Befehle&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Leertaste</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Befehlsliste anzeigen</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Befehlsliste verbergen</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Grün auf Schwarz</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Schwarz auf Weiß</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Weiß auf Schwarz</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Grün auf Gelb</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blau auf Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta auf Blau</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan auf Weiß</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Weiß auf Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blau auf Schwaru</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bernstein auf Schwarz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Schnelles Editieren</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Laufleiste</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Befehlsleiste anzeigen</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Befehlsliste verstecken</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Befehlsliste</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Töne benutzen</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Unten</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Oben</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Versteckt
 </translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Schwarz auf Pink</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Pink auf Scwarz</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Vorgabe</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Sitzung</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editieren...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>History...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Hier clicken für die normale Ansicht.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>History Zeilen:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Befehl hinzufügen</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Geben Sie den Befehl ein,
 den Sie hinzufügen wollen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/go.ts b/i18n/de/go.ts
index 70a6385..223a227 100644
--- a/i18n/de/go.ts
+++ b/i18n/de/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passe</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>2-Spieler-Option</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Weiß %1, Schwarz %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Weiß gewinnt.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Schwarz gewinnt.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Unentschieden.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>I passe</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Gefangene: schwarz %1, weiß %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/gutenbrowser.ts b/i18n/de/gutenbrowser.ts
index b23724d..4357e46 100644
--- a/i18n/de/gutenbrowser.ts
+++ b/i18n/de/gutenbrowser.ts
@@ -1,462 +1,466 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Titel bearbeiten</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Font Dialog</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Der kleine braune Fuchs springt über den faulen Hund</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Lade Bibliothek Index oder FTP Seite?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation>Möchten Sie die neuesten
 Projekt Gutenberg Bibliotheken Index herunterladen?
 Oder eine FTP Seite wählen?
 </translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Bibliotheken Index</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;FTP Seite</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Etext Suche</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Bitte installieren sie unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Gutenberg Bibliothek</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Gutenbrowser</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Suche auf google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Titel bearbeiten</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Bitte installieren sie unzip in Ihrem PATH</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Lade Gutenberg Index herunter...</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Basierend auf gutenbook.pl, verfügbar von http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Viel Anerkennung an Lee Burgess,</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>für die originale Idee und das Konzept von gutenbook.
 </translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Eine Liste von aktuellen Gutenberg FTP Seiten ist auf http://promo.net/pg/index.hmtl
 </translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Für Fehlermeldungen, Kommentare oder Fragen über Gutenbrowser schicken Sie einen EMail an</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com
 </translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>Erstellt mit Qt, Qt Embedded und Qtopia, eine Plattformübergreifende Entwicklungs API
 http://www.trolltech.com
 
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Arnolds Gesetz der Dokumentation:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Wenn es existieren sollte, existiert es nicht.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Wenn es existiert, ist es veraltet.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Nur Dokumentation für</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>unnützte Programme übersteigen die</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>ersten 2 Gesetze.
 </translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>Alles ist temporär, immerhin...
 :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Datei öffnen</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Rückwärts</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Vorwärts</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Anfang</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Füge Lesezeichen hinzu</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Gehe</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Lesezeichen</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Anfang</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Bibliothek Index - Master pg verwenden.</translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation>Bibliotheken Suche</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Lade Gutenberg Index herunter...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Author</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <translation>G-M</translation>
     </message>
     <message>
         <source>N-R</source>
         <translation>N-R</translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation>S-Z</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Automatisch öffnen</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
-        <translation>Letzter Name zuerst 
+        <translation type="obsolete">Letzter Name zuerst 
 (benötigt neustart der Bibliothek)
 </translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Suche</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Fehler beim Öffnen der Bibliothek Index. Bitte laden Sie ein neues herunter &lt;/P&gt;</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>FTP Download</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Download beginnt in kürze</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Text löschen</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>Su&amp;che</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kontext Sensitiv</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Suchergebnisse</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Runterladen</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Lade ftp Seiten runter ...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Führe wget aus</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Listendatei konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Datei konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Haupt</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Gutenbrowser Einstellungen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index 1a4a466..656673a 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -1,87 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>About Shortcut</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b wurde entwickelt durch das Opie-Team, ein weltweites Netzwerk aus Softwareentwicklern die sich der freien Software verbunden fühlen.
 &lt;/p&gt;
 &lt;p&gt;
 Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist willkommen zu Opie beizutragen.
 &lt;/p&gt;
 &lt;p&gt;Besuchen Sie &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; für weitere Informationen über Opie.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Report</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Software ist immer verbesserungsfähig, und das Opie Team ist bereit dies zu tun. Dafür müssen Sie, der Anwender, uns,d em Opie Team, sagen, was besser zu machen ist oder was nicht funktioniert wie erwartet.&lt;/p&gt;(new line)
 &lt;p&gt;Das Open Palmtop Integrated Environment benutzt ein Bug Tracking System. Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt;, um Fehler zu melden.&lt;/p&gt;(new line)
 &lt;p&gt;Wenn Sie Verbesserungsvorschläge haben, sind Sie herzlich dazu eingeladen das Bug Tracking System zu benutzen um Ihren Wunsch einzubringen. Versichern Sie sich bitte den Grad des Wunsches als &quot;Feature&quot; festzulegen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Schließen  Sie sich an</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
 &lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
 &lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index dee14d5..96d9b5f 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -1,88 +1,94 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>konnte Datei nicht öffnen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Beide Akkus werden geladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Lade...</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batteriestatus: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Gut</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisch</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Ersatzversorgung</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Netzbetrieb</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Vom Netz getrennt</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Keine Zusatzbatterie angeschlossen</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>keine Daten</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Jacket</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Restliche Energie: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Restliche Zeit: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
-        <translation>Restliche Energie: %1 %2
+        <translation type="obsolete">Restliche Energie: %1 %2
 Restliche Zeit: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>iPAQ  %1</translation>
     </message>
+    <message>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index 4f54445..80c83ba 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,69 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmemoryapplet.ts b/i18n/de/libmemoryapplet.ts
index 2026206..6d3c4d2 100644
--- a/i18n/de/libmemoryapplet.ts
+++ b/i18n/de/libmemoryapplet.ts
@@ -1,166 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Anwendungs CPU Auslastung (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU Auslastung (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt, inwieweit der Prozessor ausgelastet wird.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Diese Seite zeigt wie viel Speicher (z.B. RAM) Ihres Geräts genutzt wird.
 Speicher wird wie folgt eingeteilt:
 
 1. Benutzt- Speicher der von Opie und laufenden Anwendungen genutzt  wird.
 2. Puffer- temporärer Speicher, wird benutzt um die Performance zu verbessern
 3. Cache- Information die kürzlich genutzt aber noch nicht wieder freigegeben wurde
 4. Frei- Speicher der weder von Opie noch von Anwendungen genutzt wird.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamtspeicher: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Puffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gechached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Frei (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Gesamt Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Speicherstatus</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Auslagerungsdatei</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Basierende auf Code von:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Diese Anwendung ist lizensiert unter der GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Auslagerungsdatei</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF Card</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Card</translation>
     </message>
     <message>
         <source> On </source>
         <translation>An</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Aus</translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation>Auslagerungsdatei bearbeiten</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Erzeugen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht erkannt werden.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Auslagerungsdatei deaktiviert.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht erzeugt werden.</translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht initialisiert werden.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Auslagerungsdate erzeugt.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht entfernt werden.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Auslagerungsdate entfernt.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Auslagerungsdate aktiviert.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 MB, 4 MB, 6 MB, 8 MB, 16 MB, 32 MB, 64 MB</translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libopiecore2.ts b/i18n/de/libopiecore2.ts
index aae639d..a4b48e0 100644
--- a/i18n/de/libopiecore2.ts
+++ b/i18n/de/libopiecore2.ts
@@ -1,97 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Gelenk3</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Addressbutton</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Menubutton</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Mailbutton</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Homebutton</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Aufnahmebutton</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Unten+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Unten+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Unten+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Unten+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hoch+Rauf</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Hoch+Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hoch+Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hoch+Links</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Actionbutton</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>OK-Button</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Ende-Button</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation>Todo-Button</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Gelenk1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation>Gelenk2</translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation>Gelenk3</translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Müll</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopieobex.ts b/i18n/de/libopieobex.ts
index 0220da6..350cb9e 100644
--- a/i18n/de/libopieobex.ts
+++ b/i18n/de/libopieobex.ts
@@ -1,77 +1,140 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Bekommen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Akpezptieren</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Ablehnen</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Sie haben eine Datei vom Typ %1 ( &lt;img src=&quot;%2&quot;&gt; ) erhalten. Was möchten sie tun?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Sende:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Sende:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Fertig</translation>
+        <translation type="obsolete">Fertig</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>Infrarot ist nicht verfügbar!</translation>
+        <translation type="obsolete">Infrarot ist nicht verfügbar!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Suche nach Infrarot-Geräten.</translation>
+        <translation type="obsolete">Suche nach Infrarot-Geräten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth is nicht verfügbar</translation>
+        <translation type="obsolete">Bluetooth is nicht verfügbar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Suche nach Bluetooth-Geräten.</translation>
+        <translation type="obsolete">Suche nach Bluetooth-Geräten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>beginne zu beamen.</translation>
+        <translation type="obsolete">beginne zu beamen.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Clicke um zu senden</translation>
+        <translation type="obsolete">Clicke um zu senden</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Gesendet</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Versuch %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Suche nochmals für Infrarot-Geräte.</translation>
+        <translation type="obsolete">Suche nochmals für Infrarot-Geräte.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Beginne zu senden</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libscreenshotapplet.ts b/i18n/de/libscreenshotapplet.ts
index 94a0cbd..861248c 100644
--- a/i18n/de/libscreenshotapplet.ts
+++ b/i18n/de/libscreenshotapplet.ts
@@ -1,58 +1,58 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Name des Bildschirmfotos</translation>
+        <translation type="obsolete">Name des Bildschirmfotos</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Verzögerung</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>Sek.</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Speichern m. Namen</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Speichern unter ...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Scap</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Erfolg</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Screenshot wurde nach %1 gesendet</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
         <translation>Verbindung zu %1 fehlgeschlagen</translation>
     </message>
     <message>
         <source>Opie drawpad</source>
         <translation>Opie Schmierzettel</translation>
     </message>
     <message>
         <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
         <translation>Bitte die &lt;b&gt;QWS_DISPLAY&lt;/b&gt; Umgebungsvariable setzen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodaydatebookplugin.ts b/i18n/de/libtodaydatebookplugin.ts
index 52f3007..43c1ed0 100644
--- a/i18n/de/libtodaydatebookplugin.ts
+++ b/i18n/de/libtodaydatebookplugin.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[mit Alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganzen Tag</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Ort anzeigen</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Auswählen, um den Ort des Termins anzuzeigen</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Notizen anzeigen</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Auswählen, um die angehängte Notiz anzuzeigen</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Nur spätere Termine zeigen</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Auswählen, um nur spätere Termine anzuzeigen</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Zeit in extra Zeile</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Wieviele Termine sollen gezeigt werden?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>Nur heute</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Wieviele Tage imVoraus sollen angezeigt werden</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Wieviele weitere Tage</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Terminplaner plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Keine weiteren Termine heute</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Keine Termine heute</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/odict.ts b/i18n/de/odict.ts
index 84e6e04..2345f18 100644
--- a/i18n/de/odict.ts
+++ b/i18n/de/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Suchmethode</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation>OPIE-Wörterbuch</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Suche:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Suchmethoden</translation>
+        <translation type="obsolete">Suchmethoden</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Groß- und Kleinschreibung beachten</translation>
+        <translation type="obsolete">&amp;Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parameter</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Kein Wörterbuch definiert</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definieren</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbruch</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Lexikon</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Sprache 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Trenner</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Sprache 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Neue Suchmethode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Suchmethode ändern</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index e8a0852..730309e 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -4,721 +4,732 @@
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Empfange Datei %1 von %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Erfolgreich %1 empfangen</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Abgebrochen</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Gegenstelle hat abgebrochen</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>Laufende DDC Übertragungen</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Es sind Übertragungen im Gange.&lt;br&gt;Wenn Sie dieses Tab schliessen werden diese abgebrochen.&lt;br&gt;Trotzdem beenden?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Schliessen</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Nicht schliessen</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DDC Übertragung von %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 versucht Ihnen die Datei %2
 (%3 bytes) zu senden</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>A&amp;nnehmen</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Ablehnen</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Spreche auf Kanal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Kanal Diskussion</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Geben Sie Ihre Nachricht hier ein, um an der Kanaldiskussion teizunehmen</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Abfrage</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>WerIst</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbindungsabbruch</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Verbunden, melde mich an..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Erfolgreich angemeldet.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Socket Fehler:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbindung geschlossen</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Nächstes Tab</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Vorheriges Tab</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Tab schliessen</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Beitritt zu nicht existierenden Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Person Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Du bist dem Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Scheidende Person nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Zu verlassenden Kanal nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Kanalnachricht mit unbekanntem Absender</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>PRIVMSG von unbekanntem Typ erhalten</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Unbekannte Person gegangen - unsynchronisiert?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>Thema geändert auf</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Unbekanntes Kanalthema - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>CTCP PING erhalten von </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION mit schlechtem Empfänger</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Moduswechsel hat einen unbekannten Typ</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Moduswechsel mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Moduswechsel hat ein unbekanntes Flag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Moduswechsel mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Benutzermodi noch nicht unterstützt</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Du bist rausgeworfen worden aus</translation>
     </message>
     <message>
         <source> by </source>
         <translation>von</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>wurde rausgeworfen aus</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Unbekannte Person rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Unbekannter Kanal rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Servernachricht mit unbekanntem Kanal</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Du bist folgendem Kanal beigetreten</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Spitzname bereits vergeben, bitte mit einem anderen neu verbinden</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Es gibt keinen solchen Spitznamen</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Unbehandeltes numerisches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Unbehandeltes ctcp Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Unbehandeltes buchstäbliches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 betrat Kanal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Du hast Kanal %1 verlassen</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 verließ Kanal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanalnachricht mit unbekanntem Kanal %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 beendete (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Server %1 version %2 unterstützt Usermodes &apos;%3&apos; und Channelmodes &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Es sind %1 Operators online</translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation>Es gibt %1 unbekannte Verbindungen</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>Es gibt %1 Channels</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Bitte warten Sie eine Weile und versuchen Sie es erneut</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Name: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 verwendet Server %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 ist in den Channels: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Namen für %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Die Zeit auf Server %1 ist %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Channel oder Nick %1 gibt es nicht</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Keine Historie für %1 vorhanden</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Unbekannter Befehl: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Konnte Nick nicht ändern auf %1:%2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Sie sind nicht im Channel %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] nicht erlaubt. Sie haben nicht die nötigen Privilegien</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Verbunden mit</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 ist Idle seit %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING von unbekannter Person - Netzprobleme?</translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING mit ungültigem Channel - Netzprobleme?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP PING mit ungültigem Empfänger</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>CTCP VERSION Anfrage erhalten von</translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>CTCP PING Antwort von %1: %2 Sekunden</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>CTCP PING von %1 empfangen</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Fehlerhafte DDC Anfrage von %1</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Speichern als</translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Spreche zu</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Private Diskussion</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Geben Sie Ihren Text hier ein, um eine Nachricht an die andere Person zu schicken</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbindung getrennt</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Profilname:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Der Name dieses Serverprofils im Überblick</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostname:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Servername, mit dem verbunden werden soll - kann ein gültiger Hostname oder eine IP Adresse sein</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Der Serverport, mit dem verbunden werden soll. Normaler Weise 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Spitzname:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Dein Spitzname im IRC Netzwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Dein echter Name</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Passwort:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Passwort, um mit dem Server zu verbinden (wenn benötigt)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanäle:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Komma-separierte Liste aller Kanäle, denen Du automatisch beitreten möchtest</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Server Information bearbeiten</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Profilname benötigt</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Hostname benötigt</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Spitzname benötigt</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>Die Kanalliste muss eine Komma-
+        <translation type="obsolete">Die Kanalliste muss eine Komma-
 separierte Liste von Kanalnamen
 enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Serverliste</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Bitte wähle ein Serverprofil</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Bitte Serverprofil aus der Liste auswählen, dann OK oben rechts anklicken</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Das aktuell gewählte Serverprofil löschen</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Das aktuell gewählte Serverprofil bearbeiten</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Neues Serverprofil hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Server Nachrichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Kommandos hier eingeben. Eine Liste verfügbarer Kommandos findet man in der OpieIRC Hilfe</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Verbinde mit</translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Du bis nun als %1 bekannt</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Spitznamen Änderung einer unbekannten Person</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 ist nun bekannt als %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Dargestellte Zeilen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Zeilenanzahl, die dargestellt werden bevor alte Zeilen gelöscht werden - dies ist nötig um den Speicherverbrauch zu begrenzen. Setze 0, wenn Du das nicht brauchst</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Hintergrundsfarbe :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Im Chat benutzte Hintergrundsfarbe</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Normale Textfarbe:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Im Chat benutzte Textfarbe</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Fehler Farbe:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Textfarbe, die benutzt wird, um Fehlermeldungen darzustellen</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Von Dir geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Textfarbe, die von Dir geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Von anderen geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Textfarbe, die von anderen geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Vom Server geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Textfarbe, die vom Server geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Benachrichtigungen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Textfarbe, die benutzt wird, um Benachrichtigungen darzustellen</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Zeit im Logfile anzeigen</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Tastaturabkürzungen</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Fehlende Beschreibung</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Inhaltsbeschreibung dieses Reiters</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Reiter schließen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Anwendung</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serververbindungen, Kanäle, Gespräche und andere Sachen werden hier sein</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Erstelle eine neue Verbindung zu einem IRC-Server</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Konfiguriere OpieIRC&apos;s Verhalten und Aussehen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>gibt Channel Operator Status an</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>entfernt Channel Operator Status von</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>gibt Voice an</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>entfernt Voice von</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index 67d8e67..9a86ebc 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -1,366 +1,381 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Dieser Bereich zeigt alle verfügbaren Tests, die Ergebnisse von durchgeführten Tests und Vergleichswerte für das eingestelle Gerät.
 Mit den Auswahlboxen kann man die gewünschten Tests einstellen.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation></translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Ergebnisse</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Vergleich</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Integer Berechnungen</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Fliesskomma Berechnungen</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Text Rendern</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Gfx Rendern</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>Test&amp;s starten!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Hier klicken um die ausgewählen Tests zu starten.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Wählen Sie ein Model um die Ergebnisse zu vergleichen.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>Fehler</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Dieser Graph zeigt an wieviel Speicher auf dieser CompactFlash-Karte verwendet wird.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Dieser Graph zeigt den auf dieser Festplatte verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Dieser Graph zeigt den auf dieser Secure Digital Memory Card verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Dieser Graph zeigt an, wie viel des eingebauten Speichers zur Zeit belegt wird.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Dieser Graph zeigt den von der RAM Disk verwendeten Speicher an.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>CPU-Auslastung für Anwendungen (%)</translation>
+        <translation type="obsolete">CPU-Auslastung für Anwendungen (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Systemauslastung (%)</translation>
+        <translation type="obsolete">Systemauslastung (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Typ:</translation>
+        <translation type="obsolete">Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Diese Seite zeigt die Auslastung des Prozessors.</translation>
+        <translation type="obsolete">Diese Seite zeigt die Auslastung des Prozessors.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Gepufferter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gecached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Freier Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamter Speicher: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Diese Seite zeigt wieviel Speicher (z.B. RAM) auf dem Gerät momentan belegt ist.
 Speicher wird wie folgt unterteilt:
 1. Belegt - Speicher, der von Opie und laufenden Anwendungen belegt wird.
 2. Puffer - Temporärer Speicher um die Performanz zu steigern
 3. Gecached - Information die seit kurzem nicht mehr benutzt wird, aber noch nicht freigegeben wurde.
 4. Frei - Speicher, der nicht durch Opie oder Anwendungen belegt wird. </translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Gesammter Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Benutzung#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ei nModul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wählen Sie einen Befehl und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt; um den Befehl auszuführen.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klicken Sie hier, um den Befehl an das Module zu senden.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen der Module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Benutzt von</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Wirklich %1 für dieses Modul
 ausführen?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Verfügbar (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dies ist eine Liste aller Prozesse dieses Gerätes.
 Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt zu bekommen oder um ein Signal dorthin zu senden.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wählen Sie ein Signal aus und drücken Sie rechts &lt;b&gt;Senden&lt;/b&gt; um das Signal an den Prozess zu senden.
 &lt;b&gt;Achtung:&lt;/b&gt;Das Senden von Signalen sollte nur dann durchgeführt werden, wenn Sie wissen was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klicken Sie hier, um das Signal an den Prozess zu senden.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen über den gewählten Prozess an.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Wirklich %1 an diesen
 Prozess senden?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeminformationen</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Speichermedium</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Prozesse</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiliert von:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Geschrieben am:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Diese Seite zeigt die aktuelle Version von Opie, des Linux Kernels und der auf diesem Gerät verwendeten Distribution.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Model: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Hersteller:</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation>Qt/E Version</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 72691ff..d508f92 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,145 +1,149 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Dieses Gerät gehört </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Bitte füllen Sie Ihre Visitenkarte aus</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Keine Plugins aktiviert</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Hier klicken, um das entsprechende 
 Programm zu starten</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Today Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Das Today Modul &apos;%1&apos; verursachte beim letzten Laden einen Absturz. Stellen Sie sicher, dass das Modul richtig installiert ist. Today fährt fort und probiert Module zu laden.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Heute von Maximilian Reiß</translation>
+        <translation type="obsolete">Heute von Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klicken Sie hier, um den Konfigurations-
 dialog zu starten</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Reihenfolge des Plugin-Ladens:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktiv/Reihenfolge</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Wählen Sie eine Checkbox um ein Plugin zu aktivieren und deaktivieren oder verwenden Sie die Pfeile rechts um die Reihenfolge der Anzeige festzulegen</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Today konfigurieren</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>aktualisieren</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Soll Heute bei starten automatisch gestartet werden.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autostart bei resume?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>Kleiner Banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Soll der Banner kleiner angezeigt werden</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Der Autostart wird erst aktiv, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>Minuten inaktiv</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Symbolgröße in Pixeln einstellen</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation></translation>
     </message>
     <message>
         <source> sec</source>
         <translation>Sekunden</translation>
     </message>
     <message>
         <source>never</source>
         <translation>niemals</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/zsafe.ts b/i18n/de/zsafe.ts
index bb8cd87..a59ed4b 100644
--- a/i18n/de/zsafe.ts
+++ b/i18n/de/zsafe.ts
@@ -1,573 +1,625 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>ComboBox DateitypFilter
 Bearbeiten oder auswählen des Filters</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>bestätigt die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKKnopf</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>verwirft die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>AbbruchKnopf</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>zeigt den ausgewählten Dateinamen</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Dateinamen Zeileneditor
 
 Zeigt die ausgewählte Zeile
 und erlaubt die direkte
 Dateinamen Eingabe</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Verzeichnis
 Bearbeiten oder auswählen des Verzeichnisnamens</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Verzeichnis Listenansicht
 
 Zeigt die Liste der Verzeichnisse und Dateien</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>Verz</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Kategorie oder Eintrag bearbeiten</translation>
+        <translation type="obsolete">Kategorie oder Eintrag bearbeiten</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Kategorie oder Eintrag löschen</translation>
+        <translation type="obsolete">Kategorie oder Eintrag löschen</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Eintrag finden</translation>
+        <translation type="obsolete">Eintrag finden</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Textdatei entfernen</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Kein Dokument angegeben.
 Sie müssen erst ein neues
 Dokument erstellen</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Textdatei exportiren</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Textdatei importieren</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Möchten Sie speichern</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>vor dem Weitermachen?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Nun müssen sie
 ein Passwort eingeben
 für das neue Dokument.</translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Konnte Verzeichnis %1 nicht erstellen.&lt;/P&gt;&lt;P&gt;ZSafe wird beendet&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZSafe:
 </translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Kein Dokument engegeben. Sie müssen erst ein neues Dokument erstellen&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Sie müssen erst ein neues Dokument erstellen. Dokument anlegen?&lt;/P&gt;
 </translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;von Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Übersetzung von Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="obsolete">&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;von Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Übersetzung von Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Info anzeigen</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/bluepin.ts b/i18n/dk/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/dk/bluepin.ts
+++ b/i18n/dk/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/bluetooth-manager.ts b/i18n/dk/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/dk/bluetooth-manager.ts
+++ b/i18n/dk/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/calculator.ts b/i18n/dk/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/dk/calculator.ts
+++ b/i18n/dk/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/checkbook.ts b/i18n/dk/checkbook.ts
index 2cdb02b..dafff9b 100644
--- a/i18n/dk/checkbook.ts
+++ b/i18n/dk/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/datebook.ts b/i18n/dk/datebook.ts
index cb64e37..669dcab 100644
--- a/i18n/dk/datebook.ts
+++ b/i18n/dk/datebook.ts
@@ -144,680 +144,688 @@ Quit anyway?</source>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/embeddedkonsole.ts b/i18n/dk/embeddedkonsole.ts
index 8658bbc..c64ebf8 100644
--- a/i18n/dk/embeddedkonsole.ts
+++ b/i18n/dk/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/go.ts b/i18n/dk/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/dk/go.ts
+++ b/i18n/dk/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/gutenbrowser.ts b/i18n/dk/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/dk/gutenbrowser.ts
+++ b/i18n/dk/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libaboutapplet.ts b/i18n/dk/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/dk/libaboutapplet.ts
+++ b/i18n/dk/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libbatteryapplet.ts b/i18n/dk/libbatteryapplet.ts
index aeb2c4a..b2e341e 100644
--- a/i18n/dk/libbatteryapplet.ts
+++ b/i18n/dk/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libliquid.ts b/i18n/dk/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/dk/libliquid.ts
+++ b/i18n/dk/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libmemoryapplet.ts b/i18n/dk/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/dk/libmemoryapplet.ts
+++ b/i18n/dk/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/libopiecore2.ts b/i18n/dk/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/dk/libopiecore2.ts
+++ b/i18n/dk/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libopieobex.ts b/i18n/dk/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/dk/libopieobex.ts
+++ b/i18n/dk/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libscreenshotapplet.ts b/i18n/dk/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/dk/libscreenshotapplet.ts
+++ b/i18n/dk/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/dk/libtodaydatebookplugin.ts
index 00283f7..2090513 100644
--- a/i18n/dk/libtodaydatebookplugin.ts
+++ b/i18n/dk/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/odict.ts b/i18n/dk/odict.ts
index 88ebad1..a021376 100644
--- a/i18n/dk/odict.ts
+++ b/i18n/dk/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ase sensitive</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Search methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/opieirc.ts b/i18n/dk/opieirc.ts
index fb55663..9e54837 100644
--- a/i18n/dk/opieirc.ts
+++ b/i18n/dk/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/dk/sysinfo.ts
index 3528d42..c5017ae 100644
--- a/i18n/dk/sysinfo.ts
+++ b/i18n/dk/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/today.ts b/i18n/dk/today.ts
index 60233b2..cf928b2 100644
--- a/i18n/dk/today.ts
+++ b/i18n/dk/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/zsafe.ts b/i18n/dk/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/dk/zsafe.ts
+++ b/i18n/dk/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/bluepin.ts b/i18n/en/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/en/bluepin.ts
+++ b/i18n/en/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/bluetooth-manager.ts b/i18n/en/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/en/bluetooth-manager.ts
+++ b/i18n/en/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 4bf1fcb..53b29b9 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 9fc7a8b..5d7e329 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -132,692 +132,700 @@ Quit anyway?</source>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 8ceb4ac..a5a1f2d 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/go.ts b/i18n/en/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/en/go.ts
+++ b/i18n/en/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/gutenbrowser.ts b/i18n/en/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/en/gutenbrowser.ts
+++ b/i18n/en/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libaboutapplet.ts b/i18n/en/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/en/libaboutapplet.ts
+++ b/i18n/en/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index 83f77d4..2976e72 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libliquid.ts b/i18n/en/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/en/libliquid.ts
+++ b/i18n/en/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libmemoryapplet.ts b/i18n/en/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/en/libmemoryapplet.ts
+++ b/i18n/en/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libopiecore2.ts b/i18n/en/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/en/libopiecore2.ts
+++ b/i18n/en/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopieobex.ts b/i18n/en/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/en/libopieobex.ts
+++ b/i18n/en/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libscreenshotapplet.ts b/i18n/en/libscreenshotapplet.ts
index ded2f36..b32ed89 100644
--- a/i18n/en/libscreenshotapplet.ts
+++ b/i18n/en/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/en/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/en/libtodaydatebookplugin.ts
+++ b/i18n/en/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/odict.ts b/i18n/en/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/en/odict.ts
+++ b/i18n/en/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opieirc.ts b/i18n/en/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/en/opieirc.ts
+++ b/i18n/en/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/en/sysinfo.ts
index 10f2b46..3990448 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 5d7b39b..589d4f6 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/zsafe.ts b/i18n/en/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/bluepin.ts b/i18n/es/bluepin.ts
index 93f2e19..048ddc8 100644
--- a/i18n/es/bluepin.ts
+++ b/i18n/es/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Introduzca el código PIN</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Introduzca el código PIN:</translation>
+        <translation type="obsolete">Introduzca el código PIN:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Guardar PIN</translation>
+        <translation type="obsolete">Guardar PIN</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Aceptar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Conexión saliente hacia </translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Conexión entrante desde </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/bluetooth-manager.ts b/i18n/es/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/es/bluetooth-manager.ts
+++ b/i18n/es/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/calculator.ts b/i18n/es/calculator.ts
index cdd9c02..db78eb7 100644
--- a/i18n/es/calculator.ts
+++ b/i18n/es/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Estándar</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index a5b8fbd..059b519 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduzca aquí el banco de esta chequera.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número cuenta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ésta es una lista de todas las transacciones de esta chequera.
 
 Para ordenar las entradas por un campo específico, pulse el nombre de la columna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger con clave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Pulse aquí para des/habilitar protección con clave de esta chequera.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme clave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Por favor, confirme su clave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Por favor, introduzca su clave para deshabilitar la protección con clave:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Balance</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Chequera</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduzca símbolo de la moneda:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduzca aquí su símbolo de moneda local.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostrar si la chequera está
 protegida con clave</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar que la chequera está protegida con clave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar balances chequera</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar el balance actual para cada chequera.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nobre de la chequera</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Balance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Otro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viaje</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Crédito misc</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 758aa12..9d64f36 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -141,688 +141,700 @@ Libere espacio y vuelva a intentarlo.
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emitir esta aparición</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Comienzo de las citas</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora inicio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuración de la alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prefijar alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Miscelánea</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo filas:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medianas</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grandes</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista preferida:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Saltar a hora actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Visualización de la hora</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inicio-fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">LMXJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emitir</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetición...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Cada día...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Cada semana...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Cada mes...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Cada año...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Hora inicio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nueva Cita</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunión</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almuerzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Ene 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarma</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> minutos</translation>
+        <translation type="obsolete"> minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenciosa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Audible</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descripción </translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inicio - Fin </translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">días</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almuerzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>El %1 %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ª</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Día(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mes(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation>en </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita Periódica </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Terminar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mié</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Var semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index be5f3fe..1145773 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Cortar línea</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Timbre</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation>nueva sesión</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Fuentes</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Sesiones</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla Completa</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>Historia...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Para salir del modo pantalla completa, pulse aquí.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/go.ts b/i18n/es/go.ts
index 240f6da..8ac4dd2 100644
--- a/i18n/es/go.ts
+++ b/i18n/es/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nuevo juego</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pasar</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Rendirse</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opción 2 jugadores</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Blancas %1, Negras %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Blancas ganan.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Negras ganan.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Empate.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Yo paso</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisioneras: blancas %1, negras %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/gutenbrowser.ts b/i18n/es/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/es/gutenbrowser.ts
+++ b/i18n/es/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 74404e4..7bc09b8 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -1,98 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Atajo &apos;Acerca de&apos;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; está escrito y mantenido por el Equipo de Opie, una red mundial de ingenieros de software comprometidos con el desarrollo de software libre.
 &lt;/p&gt;
 &lt;p&gt;
 Ningún grupo, compañia u organización controla el código fuente de Opie. Todo el mundo puede contribuir.
 &lt;/p&gt;
 &lt;p&gt;
 Visite &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; para más información acerca del Proyecto Opie.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Informe de fallos</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El software siempre puede mejorarse, y el Equipo de Opie está listo para hacerlo. No obstante, usted - el usuario - debe decirnos qué cree que no funciona como debería o puede mejorarse.&lt;/p&gt;
 &lt;p&gt;Open Palmtop Integrated Environment tiene un sistema de seguimiento de fallos. Visite &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; para enviarlos.&lt;/p&gt;
 &lt;p&gt;Si tiene cualquier sugerencia para mejorar le animamos a que use el sistema de seguimiento de fallos para registrarla. Asegúrese de usar la severidad &quot;Feature Wish&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Únase</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No necesita ser un desarrollador de software para ser miembro del Equipo Opie. Puede unirse a los equipos nacionales que traducen las interfaces de los programas. También puede proporcionar gráficos, temas, sonidos y documentación mejorada. ¡Usted decide!&lt;/p&gt;
 &lt;p&gt;Visite &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; si desea informarse sobre los proyectos en los que puede participar&lt;/p&gt;
 &lt;p&gt;Si necesita más información o documentación puede obtenerla en &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation>&lt;p&gt;
+        <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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</translation>
     </message>
+    <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;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index 9978345..1e37f66 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -1,87 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Cargando</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado batería:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bueno</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bajo</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy bajo</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Alimentación emergencia</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentación conectada</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentación externa desconectada</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>no pude abrir fichero</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Cargando ambos dispositivos</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Sin chaqueta con batería insertada</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>sin datos</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Chaqueta</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Carga Restante: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Tiempo Restante: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
-        <translation>Carga Restante: %1 %2
+        <translation type="obsolete">Carga Restante: %1 %2
 Tiempo Restante: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
+    <message>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 75e38d7..6718600 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Líquido</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmemoryapplet.ts b/i18n/es/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/es/libmemoryapplet.ts
+++ b/i18n/es/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiecore2.ts b/i18n/es/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/es/libopiecore2.ts
+++ b/i18n/es/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopieobex.ts b/i18n/es/libopieobex.ts
index a9c5d94..22125c0 100644
--- a/i18n/es/libopieobex.ts
+++ b/i18n/es/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recibido:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Denegar</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Ha recibido un fichero de tipo %1 (&lt;img src=&quot;%2&quot;&gt; ) ¿Qué quiere hacer?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Hecho</translation>
+        <translation type="obsolete">Hecho</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>¡Infrarrojos no habilitados!</translation>
+        <translation type="obsolete">¡Infrarrojos no habilitados!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Buscando dispositivos IrDa.</translation>
+        <translation type="obsolete">Buscando dispositivos IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth no disponible</translation>
+        <translation type="obsolete">Bluetooth no disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Buscando dispositivos bluetooth.</translation>
+        <translation type="obsolete">Buscando dispositivos bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Programando para emitir.</translation>
+        <translation type="obsolete">Programando para emitir.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Pulse para emitir</translation>
+        <translation type="obsolete">Pulse para emitir</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Intento %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Buscando de nuevo IrDa.</translation>
+        <translation type="obsolete">Buscando de nuevo IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Comenzar envío</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libscreenshotapplet.ts b/i18n/es/libscreenshotapplet.ts
index 0972bbd..2ae1114 100644
--- a/i18n/es/libscreenshotapplet.ts
+++ b/i18n/es/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Nombre del pantallazo </translation>
+        <translation type="obsolete">Nombre del pantallazo </translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Retraso</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Grabar nombrado</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Grabar pantallazo como...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Captura</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Pantallazo subido a %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/es/libtodaydatebookplugin.ts
index 7fd84ec..3425837 100644
--- a/i18n/es/libtodaydatebookplugin.ts
+++ b/i18n/es/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[con alarma]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Día completo</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostrar localidad</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Mostrar sólo últimas citas</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostrar hora en línea extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>¿Cuántas citas deben ser mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>sólo hoy</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Cuántos días más deben estar en el rango</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Cuántos días mas</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Módulo Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>No hay más citas hoy</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Sin citas hoy</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/odict.ts b/i18n/es/odict.ts
index 3dc261d..9fdca59 100644
--- a/i18n/es/odict.ts
+++ b/i18n/es/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Método de búsqueda</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Cambiar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>Diccionario OPIE</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Consulta:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Métodos de búsqueda</translation>
+        <translation type="obsolete">Métodos de búsqueda</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Sensible a may/min</translation>
+        <translation type="obsolete">&amp;Sensible a may/min</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parámetro</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Sin diccionario definido</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definir uno</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Diccionario-Opie</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Fichero diccionario</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Idioma 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Degollador</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Idioma 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nuevo método de búsqueda</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Cambiar método de búsqueda</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index 6339ec8..42c638c 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -1,721 +1,732 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Hablando de canales</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Discusión de canales</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escriba aquí sus mensajes para participar en la dicusión de canales</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Petición</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Vesión</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Quien es</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Conectado, registrándome ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Registrado con éxito.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Error de conexión: </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Unión de canal inexistente - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persona ya se ha unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Ya te has unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Persona separación no encontrada - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>No encontré canal para la parte - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensaje del canal de emisor desconocido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Recibido PRIVMSG de tipo desconocido</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Ha salido persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>cambió asunto a </translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Asundo del canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recibido un CTCP PING de </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con mal destinatario</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Cambio de modo de tipo desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio de modo con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio de modo con indicador desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio de modo con kanal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de usuario no implentados todavía</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Ha sido expulsado de </translation>
     </message>
     <message>
         <source> by </source>
         <translation>por </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>fue expulsado de </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsión de persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsión de canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensaje del servidor con canal desconocido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Unido al canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Apodo en uso, por favor, reconectese con uno diferente</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>No hay tal apodo</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Recibido comando numérico no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Recibido comando ctcp no manejado: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Recibido comando literal no manejado: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 unido al canal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Ha dejado el canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 dejó el canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Mensaje del canal con canal desconocido %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 ha salido (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Hablando con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discusión privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escriba aquí su texto para enviar un mensaje a la otra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nombre del perfil :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>El nombre de este perfil del servidor en el vistazo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Máquina :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>El servidor al que conectarse - puede ser un nombre de máquina válido o dirección IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Puerto :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>El puerto del servidor al que conectarse. Usualmente 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Apodo :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Su apodo en la red IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nombre real :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Su nombre real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Clave :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Clave para conectarte al servidor (si es requerida)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canales :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de todos los canales, seperados por comas, a los que le gustaría unirse automáticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar información del servidor</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nombre de perfil requerido</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nombre de máquina requerido</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Apodo requerido</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>La lista del canal necesita contener una
+        <translation type="obsolete">La lista del canal necesita contener una
 lista separada por comas de nombres
 de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Navegador lista servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Por favor, elija un perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleccione un perfil de servidor de esta lista y entonces pulse Ok en la esquina uperior derecha</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Borrar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Añadir un nuevo perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Mensajes del servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escriba aquí comandos. Una lista de comandos disponibles puede encontrarse en la ayuda de OpieRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Ahora es conocido como %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Cambio de apodo de una persona desconocida</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 es ahora conocido como %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Líneas mostradas :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Cantidad de líneas mostradas en los chats antes de que sean borradas la viejas - es necesario para restringir el consumo de memoria. Fíjelo en 0 si no neceista esto</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Color de fondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Color del fondo que se usará en los chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Color del texto normal :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Color del texto que se usará en los chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Color de error :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Color del texto que se usará al mostrar errores</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto propio :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Color del texto que se usará para identificar el texto escrito por si mismo</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto ajeno :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Color del texto que se usará para identificar el texto escrito por otros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito por el servidor :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Color del texto que se usará para identificar el texto escrito por el servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificaciones :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Color del texto que se usará al mostrar notificaciones</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descripción perdida</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descripción del contenido de la pestaña</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Cerrar esta pestaña</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Ciente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Conexiones al sevidor, canales, peticiones y otras cosas serán colocadas aquí</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crear una nueva conexión a un servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 0445959..e93df1a 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,365 +1,380 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Este área muestra las pruebas disponibles, los resultados para las que se han realizado, y la comparación con los valores para un dispositivo seleccionado. Use las casillas para seleccionar las pruebas que desea realizar.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Pruebas</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Comparación</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Aritmética de Enteros  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Unidad de Punto Flotante</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Renderizado de Texto</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Renderizado Gfx  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Rendimiento de la RAM</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Rendimiento de la Tarjeta SD</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Rendimiento de la Tarjeta CF  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>¡&amp;Comenzar las Pruebas!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Pulse aquí para realizar las pruebas seleccionadas.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Escoja un modelo con el que comparar sus resultados.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>error</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>En</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Uso de CPU por la aplicación (%)</translation>
+        <translation type="obsolete">Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Uso de CPU por el sistema (%)</translation>
+        <translation type="obsolete">Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Tipo: </translation>
+        <translation type="obsolete">Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Esta página muestra el procesador que está siendo usado.</translation>
+        <translation type="obsolete">Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cacheada (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Está página muestra cómo la memoria (es decir RAM) está siendo usada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Memoria Swap Total: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>¿Está seguro de que desea ejecutar
 %1 para este módulo?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>¿Está seguro de que sea enviar %1
 a este proceso?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Pruebas</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Registros</translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página muestra la versión actual de Opie, del kernel Linux y de la distribución corriendo es este dispositivo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Vendedor: </translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation>Compilado contra Qt/E </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index 64ff447..5f2abef 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -1,248 +1,248 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Formato hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24 horas</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 horas</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato fecha</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Inicio semana</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Hora del sistema</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Configuraci�n</translation>
+        <translation>Configuraci�</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Predecir</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation>�Contin�o?</translation>
+        <translation>Contino?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Ejecutando:
 ntpdate </translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Error al obtener la hora de la red.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Error al ejecutar ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Servidor horario</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Error al obtener la hora del
 servidor: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>No pude conectar con el servidor </translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>Pregunt� por un retraso de %1 minutos, pero s�lo %2 minutos transcurrieron desde el �ltimo ajuste.&lt;br&gt;�Contin�o?</translation>
+        <translation>Pregunt�por un retraso de %1 minutos, pero s�o %2 minutos transcurrieron desde el ltimo ajuste.&lt;br&gt;Contino?</translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation>%1 segundos</translation>
     </message>
     <message>
         <source>Retrieving time from network...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Hora de inicio</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>Ajuste horario</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Nueva hora</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Obtener hora de la red</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation>Predicci�n de deriva horaria</translation>
+        <translation>Predicci� de deriva horaria</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Ajuste estimado</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Hora predicha</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Ajuste [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation>�ltima [h]</translation>
+        <translation>�tima [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation>Correcci�n [s]</translation>
+        <translation>Correcci� [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Predecir hora</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fijar hora predicha</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation> s/h</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Servidor horario</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>minutos entre actualizaciones horarias</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>minutos entre predicciones</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation>Mostrar informaci�n del servidor horario</translation>
+        <translation>Mostrar informaci� del servidor horario</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation>Mostrar informaci�n de la predicci�n horaria</translation>
+        <translation>Mostrar informaci� de la predicci� horaria</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Obtener hora de la red</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fijar hora predicha</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index b5172cd..b6292a6 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Piche aquí para lanzar la aplicación asociada</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Hoy por Maximilian Reiß</translation>
+        <translation type="obsolete">Hoy por Maximilian Reiß</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Pulse en las casillas para activar un módulo o use los botones de desplazamiento para cambiar el orden de aparición</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuración de Hoy</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>¿arrancar al encender?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini-avisos</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Tiene aviso pequeño</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamaño del icono</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/bluepin.ts b/i18n/fr/bluepin.ts
index e74fc8e..2a92bc3 100644
--- a/i18n/fr/bluepin.ts
+++ b/i18n/fr/bluepin.ts
@@ -1,37 +1,85 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Veuillez entrer le code PIN</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Entrez le code PIN :</translation>
+        <translation type="obsolete">Entrez le code PIN :</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Enregistrer code PIN</translation>
+        <translation type="obsolete">Enregistrer code PIN</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Connexion à </translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Connexon entrante de </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/bluetooth-manager.ts b/i18n/fr/bluetooth-manager.ts
index 6c6cc61..ae62374 100644
--- a/i18n/fr/bluetooth-manager.ts
+++ b/i18n/fr/bluetooth-manager.ts
@@ -1,341 +1,369 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Gestionnaire Bluetooth</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Nom de l&apos;appareil : &lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>Adresse MAC : </translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Classe</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Test</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Les modifications ont été effectuées.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>Rescanner les services</translation>
+        <translation type="obsolete">Rescanner les services</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>Grouper</translation>
+        <translation type="obsolete">Grouper</translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Test1 : </translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>Aucun service trouvé</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Aucune connexion trouvée</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Fenêtre 1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Appareils</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Nom de l&apos;appareil</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>En ligne</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Rechercher appareils</translation>
+        <translation type="obsolete">Rechercher appareils</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Connexions</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Type de connexion</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Signal</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Config</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Conf Bluetooth de base</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Mot de passe par défaut</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>activer l&apos;identification</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>activer le cryptage</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation>Activer la recherche de pages</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation>Activer la recherche de requêtes</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Table d&apos;association Rfcomm</translation>
+        <translation type="obsolete">Table d&apos;association Rfcomm</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Etiquette de statut</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Fenêtre 2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Nom de l&apos;appareil</translation>
+        <translation type="obsolete">Nom de l&apos;appareil</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>modifier les paramètres</translation>
+        <translation type="obsolete">modifier les paramètres</translation>
     </message>
     <message>
         <source>active</source>
         <translation>actif</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>nom du service</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Modifier le nom 
+        <translation type="obsolete">Modifier le nom 
 de l&apos;appareil</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>Code d&apos;accès
+        <translation type="obsolete">Code d&apos;accès
 par défaut</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>TextLabel9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>se connecter</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>se connecter + configurer</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>se déconnecter</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>envoyer fichiers</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Quel fichier doit être envoyé ?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Rechercher les appareils</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Commencer la rechercher</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Ajouter un appareil</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Arrêter la recherche</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>nom de connexion ppp</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>Entrez le nom d&apos;un script ppp : </translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Se connecter</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>se connecter</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>se connecter + configurer</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>se déconnecter</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Association Rfcomm</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Associer un appareil à une interface</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Fenêtre 2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>Mac</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Canal</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaire : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/calculator.ts b/i18n/fr/calculator.ts
index 686cc4b..a430db3 100644
--- a/i18n/fr/calculator.ts
+++ b/i18n/fr/calculator.ts
@@ -1,332 +1,340 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>,</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculatrice</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Masse</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Surface</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Températures</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>carats</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm^3</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>pieds^3</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>pouces^3</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>onces liquide (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>pouces</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>Kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>Km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>livres</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>milles</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>milles naut</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>points</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pintes</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>quarts</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm^2</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>pieds^2</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>pouces^2</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>Km^2</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m^2</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>milles^2</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm^2</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>yard^2</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>cuil. à soupe</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>cuil. à café</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnes</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yards</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 4307941..f52b221 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,648 +1,656 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de comptes</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nouveau livre</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transactions</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Graphiques</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Entrez ici le nom du livre de comptes.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Sélectionnez le type de livre ici.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banque : </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Entrez ici le nom de la banque de ce livre.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>N° compte : </translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Entrez ici le n° du compte de ce livre de comptes.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>N° PIN : </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Entrez ici le numéro de PIN pour ce livre de comptes .</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Solde : </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Entrez ici le solde initial pour ce livre de comptes .</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Entrez les informations supplémentaires pour ce livre de comptes ici.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Voici la liste de toutes les transactions entrées pour ce livre de comptes.
 
 Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de la colonne.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Cliquez ici pour ajouter une nouvelle transaction.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Sélectionnez une transaction et cliquez ici pour la modifier.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Sélectionnez un livre de comptes et cliquez ici pour l&apos;effacer.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Sélectionnez le graphique désiré ci-dessous et cliquez sur le boutton Dessiner.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Cliquez ici pour sélectionner le type de graphique désiré.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Solde du compte</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retrait par catégorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Dépôt par catégorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dessiner</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Cliquez ici pour dessiner le graphique sélectionné.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Supprimer la transaction</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protéger par mot de passe</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Cliquez ici pour activer/désactiver la protection du livre de comptes par mot de passe.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer votre mot de passe : </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Veuillez confirmer votre mot de passe : </translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe : </translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Trier par : </translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Sélectionnez la méthode de trie du livre de compte ici.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Ordre d&apos;entrée</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Trier Date</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurer &quot;Livre de compte&quot;</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Entrer le symbole de la devise : </translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Entrez le symbole de la devise locale ici.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Montrer si le livre de comptes est protégé
 par mot de passe</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera si le &quot;livre de compte&quot; est protégé par mot de passe.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Montrer le solde des livres de comptes</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera le solde pour chaque livre de comptes.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Nouveau type de compte</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Types de compte</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nouvelle catégorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Dépense</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Revenu</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Catégories</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Bénéficiaire</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nouveau bénéficiaire</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Bénéficiaires</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Ouvrir dernier Livre de Comptes</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Cliquez ici pour que le dernier livre de compte utilisé soit ouvert au démarrage.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Afficher dernier onglet du livre de compte</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Cliquez ici pour définir si le dernier onglet affiché du livre de compte doit être sélectionné.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Enregistrer nouvelle description comme bénéficiaire</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Cliquez ici pour enregistrer la nouvelle description dans la liste des bénéficiaires.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de comptes</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Cliquez ici pour créer un nouveau livre de comptes.
 
 Vous pouvez aussi sélectionner &quot;Nouveau&quot; à partir du menu &quot;Livre de Comptes&quot;.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Sélectionnez un livre de comptes puis cliquez ici pour le modifier.
 
 Vous pouvez aussi sélectionner &quot;Modifier&quot; à partir du menu de &quot;Livre de Comptes&quot;, ou bien cliquer
 en maintenant appuyé sur le nom d&apos;un livre de comptes.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Sélectionnez un livre de comptes puis cliquez ici pour le détruire.
 
 Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;Livre de comptes&quot;.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Voici une liste de tous les livres de compte disponibles actuellement.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Supprimer un livre de comptes</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Cliquez ici pour configurer cette application.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nom du livre de comptes</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Entrez votre un mot de passe : </translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Epargne</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Compte chèques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Liquidités</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fond de pension</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Dépense</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Véhicule</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Factures</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Vêtements</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordinateur</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Electronique</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Loisirs</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Alimentation</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Carburant</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Cinéma</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Location</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Revenu</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Professionnel</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Membre de la famille</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédit divers</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaction sur </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Débit</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Sélectionnez ici le type d&apos;opération, débit ou crédit.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Crédit</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Sélectionnez la date de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numéro : </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Entrez le numéro de chèque ici.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Entrez la description de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Sélectionnez la catégorie de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Sélectionnez le type d&apos;opération ici.
 
 Les options disponibles varient suivant le type d&apos;opération : débit ou crédit.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Montant : </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant de l&apos;opération ici.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Frais : </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant des frais bancaires associés à l&apos;opération.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Entrez ici les informations complémentaires sur l&apos;opération.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Paiement</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Chèque</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Virement</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carte de crédit</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Virement automatique</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Liquide</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index cea184c..e097eb0 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -151,689 +151,701 @@ Quitter tout de même ?</translation>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horaire</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emettre cette occurence</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Après-midi</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 Matin</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Voir les événements</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Heure de début : </translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Paramètres des alarmes</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> mn</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Style de lignes : </translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyenne</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Démarrer 
 dans : </translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Liste semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Aller à l&apos;heure courante</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Afficher heure</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Début-Fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lieu :</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>LMMJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifier</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupliquer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emettre</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Sem: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Répéter...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Quotidienne...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Hebdomadaire...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensuelle...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annuelle...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Heure de
 début</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Heure de
 fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nouvel événement</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Rendez-vous</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Déjeuner</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Dîner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Heure
 de début</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la
 journée</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuseau
 horaire
 </translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> mn</translation>
+        <translation type="obsolete"> mn</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Muette</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Forte</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Début - Fin</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">jours</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Déjeuner</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Tous les %1 de chaque </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Les %2 %1 de chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>th</source>
         <translation>,</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation>Les </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Repétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin le : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date
 de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter le</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index af82d72..ee14a53 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -1,250 +1,254 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection commande</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Editer commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes de la liste actuelle&lt;/B&gt; : </translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Autres commandes suggérées&lt;/B&gt; : </translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrer</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher liste</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Cacher liste</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleu sur magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleu</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleu sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Liste éditable</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher liste</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher liste</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Liste commandes</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Avertissement sonore</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>&lt;B&gt;Entrez commande à ajouter&lt;/B&gt; : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/go.ts b/i18n/fr/go.ts
index 2486a30..21ddd6e 100644
--- a/i18n/fr/go.ts
+++ b/i18n/fr/go.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nouvelle partie</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passer</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Jouer à deux</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Blanc %1, Noir %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Les blancs l&apos;emportent.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Les noires l&apos;emportent.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Un coup.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Je passe</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisonniers : noir %1, blanc %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/gutenbrowser.ts b/i18n/fr/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/fr/gutenbrowser.ts
+++ b/i18n/fr/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libaboutapplet.ts b/i18n/fr/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/fr/libaboutapplet.ts
+++ b/i18n/fr/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index ec99565..7ba7d64 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -1,87 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>En charge</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Niveau batterie : </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bon</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Très faible</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critique</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Sur batterie</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Adaptateur secteur connecté</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Adaptateur secteur déconnecté</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>le fichier ne peut pas être ouvert</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Chargement des deux dispositifs</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Aucune module avec batterie</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>Aucune donné</translation>
     </message>
     <message>
         <source>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>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libliquid.ts b/i18n/fr/libliquid.ts
index f9acc6d..082fd32 100644
--- a/i18n/fr/libliquid.ts
+++ b/i18n/fr/libliquid.ts
@@ -1,69 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquide</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquide</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libmemoryapplet.ts b/i18n/fr/libmemoryapplet.ts
index bdedbe8..7c80ef7 100644
--- a/i18n/fr/libmemoryapplet.ts
+++ b/i18n/fr/libmemoryapplet.ts
@@ -1,166 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilisation CPU par les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation système du CPU (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page affiche le niveau d&apos;utilisation du processeur de votre appareil.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type : </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Cette page vous montre l&apos;utilisation de la mémoire de votre PDA.
 La mémoire (i.e RAM) est divisée en catégories comme suit :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire totale : %1 Ko</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1 Ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 Ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Echange totale :  %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Status mémoire</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Mémoire</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Fichier d&apos;échange</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Plugin Info Mémoire&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Code source basé sur :&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Applet Batterie (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Ce programme est sous licence GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>A propos</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Chemin du fichier d&apos;échange</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Activé</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Désactivé</translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation>Gérer fichier d&apos;échange</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Générer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation>Echec lors de la détachement du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Fichier d&apos;échange désactivé.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Echec de création du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation>Echec d&apos;initialisation du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Fichier d&apos;échange créé.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Echec de suppression du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Fichier d&apos;échange supprimé.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Fichier d&apos;échange activé.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopiecore2.ts b/i18n/fr/libopiecore2.ts
index bf40af2..9605ad4 100644
--- a/i18n/fr/libopiecore2.ts
+++ b/i18n/fr/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Bouton Calendrier</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Bouton Message</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Maj + Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Maj + Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Maj + Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Maj + Gauche</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Bouton Fin</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Poubelle</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopieobex.ts b/i18n/fr/libopieobex.ts
index 0320861..9b2ea8a 100644
--- a/i18n/fr/libopieobex.ts
+++ b/i18n/fr/libopieobex.ts
@@ -1,77 +1,140 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recevoir :&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Refuser</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; ) Que voulez-vous faire ?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Emission :&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Emission :&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Terminé</translation>
+        <translation type="obsolete">Terminé</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa non activé !</translation>
+        <translation type="obsolete">IrDa non activé !</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Recherche des dispositifs IrDa.</translation>
+        <translation type="obsolete">Recherche des dispositifs IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth n&apos;est pas disponible</translation>
+        <translation type="obsolete">Bluetooth n&apos;est pas disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Recherche des dispositifs bluetooth.</translation>
+        <translation type="obsolete">Recherche des dispositifs bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Préparation de l&apos;envoi.</translation>
+        <translation type="obsolete">Préparation de l&apos;envoi.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Cliquez pour envoyer</translation>
+        <translation type="obsolete">Cliquez pour envoyer</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Essayer %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Recherche IrDa à nouveau.</translation>
+        <translation type="obsolete">Recherche IrDa à nouveau.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Début de l&apos;envoi</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/libscreenshotapplet.ts b/i18n/fr/libscreenshotapplet.ts
index 3b035aa..1156314 100644
--- a/i18n/fr/libscreenshotapplet.ts
+++ b/i18n/fr/libscreenshotapplet.ts
@@ -1,58 +1,58 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Nom de l&apos;image d&apos;écran</translation>
+        <translation type="obsolete">Nom de l&apos;image d&apos;écran</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Délai</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Enregister</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Enregister image sous...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Scap</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Réussi</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>L&apos;image écran a été chargé sur %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/fr/libtodaydatebookplugin.ts
index 03905c5..dbbc240 100644
--- a/i18n/fr/libtodaydatebookplugin.ts
+++ b/i18n/fr/libtodaydatebookplugin.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[avec alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>note</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la journée</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Afficher le lieu</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Pour afficher le lieu de chaque évènement</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Afficher les notes</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Pour afficher les notes liées aux évènements</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Afficher les événements seulement</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Pour n&apos;afficher que les événements à venir</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Afficher l&apos;heure sur une nouvelle ligne</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Nombre maximum d&apos;événements à afficher (par ordre chronologique)</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Nombre d&apos;événements à afficher ?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>seulement aujourd&apos;hui</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Nombre de jours total à afficher</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Nombre de jours</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Module Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Aucun événement prévu</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Pas d&apos;événement aujourd&apos;hui</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/odict.ts b/i18n/fr/odict.ts
index 5a35e62..fbdabd0 100644
--- a/i18n/fr/odict.ts
+++ b/i18n/fr/odict.ts
@@ -1,112 +1,120 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Méthode de recherche</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>Dictionnaire OPIE</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Requête : </translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Méthodes de recherche</translation>
+        <translation type="obsolete">Méthodes de recherche</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>Respecter la C&amp;asse</translation>
+        <translation type="obsolete">Respecter la C&amp;asse</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Paramètre</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Dictionnaire Opie</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Aucun dictionnaire défini</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;En définir un</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Fichier dictionnaire</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Explorer</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Langage 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Decollator</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Langage 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nouvelle méthode de recherche</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Changer la méthode de recherche</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieirc.ts b/i18n/fr/opieirc.ts
index a2803ba..b0575f6 100644
--- a/i18n/fr/opieirc.ts
+++ b/i18n/fr/opieirc.ts
@@ -1,721 +1,732 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Discussion sur le canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Canal de discution</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Entrez votre message ici pour participer au canal de discution</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Requête</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Connecté, enregistrement ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Enregistrement réussi.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Erreur de socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connexion fermée</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Accès à un canal non-existant - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Cette personne a déjà joint le canal - Désynchronisé ?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Vous êtes déjà inscrit sur ce canal - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Personne en appartée non trouvée - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Canal à par non trouvé - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Canal message avec expéditeur inconnu</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Message PRIVMSG reçu de type inconnu</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Personne inconnu a quitté - Désynchronisé ?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>sujet remplacé par</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Sujet du canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Reçu CTCP PING de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;une personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION à bénéficiaire incorrect</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Changement de mode de type inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Changement de mode avec personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Changement de mode avec drapeau inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Changement de mode sur canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modes utilisateur non encore supportés</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Vous avez été éjecté de</translation>
     </message>
     <message>
         <source> by </source>
         <translation>par</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>éjecté de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Message d&apos;éjection d&apos;un inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Ejection d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serveur de message avec canal inconnu</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Vous avez joint le canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Surnom déjà utilisé, connectez vous sous un autre surnom</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Surnom inexistant</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Commande numérique non supportée reçu : %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Commande ctcp non supportée reçu : %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Commande literale non supportée reçu : %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 a join le canal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Vous avez quitté le canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 a quitté le canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Message avec numéro de Canal  %1 inconnu</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 a quitté (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Discution avec</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discussion privée</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Entrez votre message ici pour pouvoir l&apos;envoyer à l&apos;autre personne</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nom profile : </translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Le nom du serveur de profile dans la vue d&apos;ensemble</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Nom d&apos;hôte : </translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Le serveur à joindre peut être un nom d&apos;hôte ou une adresse IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port : </translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Port du serveur à joindre. Usuellement 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Votre surnom sur le réseau IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nom Réel : </translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Votre vrai nom</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Mot de passe : </translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Mot de passe de connexion au serveur (si nécessaire)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canaux : </translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Liste des canaux que vous voulez joindre automatiquement séparés par des virgules</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editer les infomations du serveur</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nom de profile nécessaire</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nom d&apos;hote nécessaire</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Surnom nécessaire</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>La liste des canaux nécessite que
+        <translation type="obsolete">La liste des canaux nécessite que
 les noms de canaux soient séparés
 par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Liste des Serveurs</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Veuillez choisir un profile de serveur</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Sélectionnez dans la liste un profile de serveur et validez votre choix</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Détruire le profile du serveur sélectionné</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editer le profile du serveur séléctionné</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Ajouter un nouveau profile de serveur</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Messages serveur</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Entrez les commandes ici. La liste des commandes disponiblent est répertorié dans l&apos;aide</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Vous êtes enregistrés en tant que %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Surnom d&apos;une personne inconnu changé </translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 est maintenant %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Lignes affichées : </translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Nombre de lignes à afficher lors des discussions avec qu&apos;elles soient détruites - ceci est nécessaire pour limiter l&apos;espace mémoire qu&apos;elles occupent. Mettre 0 si vous ne voulez pas de limitation</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Générale</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Couleur d&apos;arrière plan : </translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Couleur d&apos;arrière plan utilisée lors des discutions</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Couleur du texte simple : </translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Couleur du texte utilisée lors des discussions</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Couleur d&apos;erreur : </translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Couleur du texte utilisée par les erreurs</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Couleur de votre texte : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Couleur du texte identifiant les messages que vous envoyez</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Couleur du texte des autres : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Couleur du texte identifiant les messages des autres</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Couleur du texte du serveur : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Couleur du texte identifiant les messages du serveur</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notifications : </translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Couleur du texte utilisée par les notifications</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Description manquante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Description contenu onglet</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Fermer cet onglet</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Connexions serveur, canaux, requêtes et autres sont placés ici</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nouvelle connexion</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Créer une nouvelle connexion à un serveur IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurer les options et l&apos;apparence d&apos;OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index d1dbfda..e87fe1d 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -1,368 +1,383 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Cette zone affiche les tests disponibles, les résultats pour chaque tests et les comparaisons de leurs valeurs avec l&apos;appareil témoin sélectionné. Utilisez les cases à cocher pour définir le test que vous voulez réaliser.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Comparaison</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Calcul sur entier</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Calcul en virgule flottante</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Affichage de texte</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Affichage d&apos;image</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Performance de la ram</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Performance carte SD</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Performance carte CF</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Démarrer les tests !</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Cliquez ici pour démarrer les tests sélectionnés.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Sélectionnez un modèle d&apos;appareil pour réaliser les comparaisons.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>Erreur</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur ce disque dur.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée dans la mémoire centrale (i.e. mémoire Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur le dique RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Utilisation du processeur par
+        <translation type="obsolete">Utilisation du processeur par
 les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Utilisation du processeur par
+        <translation type="obsolete">Utilisation du processeur par
 le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Type : </translation>
+        <translation type="obsolete">Type : </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Cette page montre la charge du processeur.</translation>
+        <translation type="obsolete">Cette page montre la charge du processeur.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 ko)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 ko)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire Totale : %1 Ko</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Cette page affiche la quantité de mémoire (i.e RAM) utilisée par votre appareil.
 Cette quantité mémoire est découpée en plusieurs catégories :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Swap Total : %1 Ko</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Utilisé#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Voici la liste de tous les modules chargés sur cet assistant personnel.
 
 Cliquez et maintenez appuyer pour voir les informations à propos du module ou pour le décharger.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Sélectionnez une commande puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer la commande au module sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Cliquez ici pour envoyer la commande sélectionné au module sélectionné.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Cette zone décrit en détail les informations au sujet de ce module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Utilisé par</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Confirmez vous l&apos;execution de
 %1 pour ce module ?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisé (%1 Ko)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponible (%1 Ko)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 Ko</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commande</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Affiche la liste de tous les processus en cours sur cet assistant personnel
 
 Cliquez et maintenez appuyer pour voir les informations à propos du processus ou pour lui envoyer un signal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Sélectionnez un signal puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer le signal au processus sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Cliquer ici pour envoyer à ce processus le signal choisi.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Cette zone montre des informations détaillés à propos de ce processus.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Voulez-vous vraiment envoyer %1
 à ce processus ?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info système</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoire</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Stockage</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processus</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Performance</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilé par : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Construit le : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Cette page affiche la version courante de Opie, du noyau Linux et de la distribution installés sur cet appareil de poche.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Modèle : </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Vendeur : </translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index bc9481e..89c6aa1 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,143 +1,147 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Propriétaire : </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Entrez vos données personnels</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Aucun module activé</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Cliquez ici pour lancer l&apos;application associée</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Aujourd&apos;hui par Maximilian Reiß</translation>
+        <translation type="obsolete">Aujourd&apos;hui par Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Cliquez ici pour accéder à la fenêtre de configuration</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Ordre chargement modules : </translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Activer/Ordonner</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Sélectionnez une case à cocher pour activer/désactiver un module ou utiliser les flèches de droite pour changer l&apos;ordre d&apos;apparition</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Config Aujourd&apos;hui</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Vérifie si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement à l&apos;allumage.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>Démarrage auto à l&apos;allumage ?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>Petite bannière</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Utiliser une petite bannière</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Après combien de minutes de veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutes inactives</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Définir la taille de l&apos;icône en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>taille icône</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>jamais</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Périodicité de rafraîchissement de &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>rafraichir</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/zsafe.ts b/i18n/fr/zsafe.ts
index a186c02..2cc7b61 100644
--- a/i18n/fr/zsafe.ts
+++ b/i18n/fr/zsafe.ts
@@ -1,573 +1,621 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Champ 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information :</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>FileDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Sélection du type de fichier</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Editer le ComboBox FileTypeFilter ou sélectionnez le filtre</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Confirme la sélection et referme le formulaire</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKButton</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>Annule la sélection et ferme le formulaire</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>CancelButton</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>Affiche le nom du fichier sélectionné</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Ligne d&apos;édition du nom de fichier
 
 affiche le fichier sélectionné
 et permet de modifier son nom</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Liste déroulante des répertoires
 permet de modifier ou de sélectionner les noms de répertoires</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Liste des fichiers et dossiers</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Liste des fichiers et dossiers
 
 affiche la liste des répertoires et fichiers</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>rép</translation>
     </message>
     <message>
         <source>file</source>
         <translation>fichier</translation>
     </message>
     <message>
         <source>link</source>
         <translation>lien</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Enregistrer document</translation>
+        <translation type="obsolete">&amp;Enregistrer document</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Enregistrer document avec nouveau mot de &amp;passe</translation>
+        <translation type="obsolete">Enregistrer document avec nouveau mot de &amp;passe</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>E&amp;xporter vers fichier texte</translation>
+        <translation type="obsolete">E&amp;xporter vers fichier texte</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Importer fichier texte</translation>
+        <translation type="obsolete">&amp;Importer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>&amp;Supprimer fichier texte</translation>
+        <translation type="obsolete">&amp;Supprimer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Ouvrir les entrées expansées</translation>
+        <translation type="obsolete">&amp;Ouvrir les entrées expansées</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Quitter</translation>
+        <translation type="obsolete">&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Fichier</translation>
+        <translation type="obsolete">&amp;Fichier</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nouveau</translation>
+        <translation type="obsolete">&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Modifier</translation>
+        <translation type="obsolete">&amp;Modifier</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>C&amp;atégorie</translation>
+        <translation type="obsolete">C&amp;atégorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Couper</translation>
+        <translation type="obsolete">&amp;Couper</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>C&amp;opier</translation>
+        <translation type="obsolete">C&amp;opier</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Coller</translation>
+        <translation type="obsolete">&amp;Coller</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Rechercher</translation>
+        <translation type="obsolete">&amp;Rechercher</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Entrée</translation>
+        <translation type="obsolete">&amp;Entrée</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;A propos</translation>
+        <translation type="obsolete">&amp;A propos</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Aide</translation>
+        <translation type="obsolete">&amp;Aide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Confirmez-vous la suppression ?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>Ne pas &amp;supprimer</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Les noms doivent être différents
 des noms de catégories.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Entrée non trouvée</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Impossible de supprimer le fichier texte.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Impossible d&apos;exporter le fichier texte.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Impossible d&apos;importer le fichier texte.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Mot de passe incorrect
 
 ZSave va se fermer.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Mot de passe incorrect.
 Rééssayer de nouveau ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Non.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Document vide ou
 mot de passe incorrect.
 Continuer ?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Oui.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Mot de passe vide.
 Veuillez recommencer.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Réentrer mot de passe</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Les mots de passe doivent être
 identiques. Vous devez les réentrer.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Fichier mot de passe enregistré.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Voulez-vous enregistrer
 avant de quitter ?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Enregistrer</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>&amp;Enregistrer avec
 nouveau mot de passe</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Ne pas enregistrer</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Dialogue d&apos;attente</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Chargement des icônes...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Nouveau document</translation>
+        <translation type="obsolete">&amp;Nouveau document</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Ouvrir document</translation>
+        <translation type="obsolete">&amp;Ouvrir document</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Enregistrer document sous..</translation>
+        <translation type="obsolete">&amp;Enregistrer document sous..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Ouvrir document ZSafe</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Nouvelle entrée</translation>
+        <translation type="obsolete">Nouvelle entrée</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Modifier la catégorie ou l&apos;entrée</translation>
+        <translation type="obsolete">Modifier la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Supprimer la catégorie ou l&apos;entrée</translation>
+        <translation type="obsolete">Supprimer la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Rechercher entrée</translation>
+        <translation type="obsolete">Rechercher entrée</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Supprimer fichier texte</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Aucun document défini.
 Vous devez en créer un nouveau</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Exporter fichier texte</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importer fichier texte</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Voulez-vous enregistrer</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 avant de poursuivre ?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Vous devez maintenant saisir
 deux fois le même mot de passe
 pour votre nouveau document.</translation>
     </message>
     <message>
         <source>&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>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/bluepin.ts b/i18n/hu/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/hu/bluepin.ts
+++ b/i18n/hu/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/bluetooth-manager.ts b/i18n/hu/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/hu/bluetooth-manager.ts
+++ b/i18n/hu/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/calculator.ts b/i18n/hu/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/hu/calculator.ts
+++ b/i18n/hu/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index 4bf1fcb..53b29b9 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index cd1f150..2967619 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -142,688 +142,700 @@ Mégis kilép?</translation>
         <source>Friday</source>
         <translation>Péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Vasárnap</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vége</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Du</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 De</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">Naptár</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Események mutatásának kezdete</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Kezdő idő:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ébresztő beállítások</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Előre beállított ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Sor stílus:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Közepes</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Hét</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Hónap</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nem</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Kezdet</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">Otthon</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Szerkeszt</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Átsugároz</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>H: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ismétlés...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Napi...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Heti...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Havi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Évi...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Kezdő időpont</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Végső időpont</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Új esemény</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Találkozó</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ebéd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vacsora</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Utazás</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthon</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>02 Jan 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Kezdő időpont</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Egész nap</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Időzóna</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>perc</translation>
+        <translation type="obsolete">perc</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Csendes</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hangos</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ismétlés</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Leírás</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Kezdet - Vég</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Jegyzet...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">nap</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Jegyzet szerkesztése</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ebéd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vég</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 minden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1-n minden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1-n minden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>szerda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>vasárnap</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Nincs ismétlés</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ismétlés rendszere</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>év</translation>
     </message>
     <message>
         <source>days</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>week</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source> and </source>
         <translation>és</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 és</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, és</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Nincs vége</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ismétlés a hét ezen napjain:</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>HétVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>years</source>
         <translation>év</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/embeddedkonsole.ts b/i18n/hu/embeddedkonsole.ts
index 8ceb4ac..a5a1f2d 100644
--- a/i18n/hu/embeddedkonsole.ts
+++ b/i18n/hu/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/go.ts b/i18n/hu/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/hu/go.ts
+++ b/i18n/hu/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/gutenbrowser.ts b/i18n/hu/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/hu/gutenbrowser.ts
+++ b/i18n/hu/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libaboutapplet.ts b/i18n/hu/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/hu/libaboutapplet.ts
+++ b/i18n/hu/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libbatteryapplet.ts b/i18n/hu/libbatteryapplet.ts
index 1b9a30a..fb0939e 100644
--- a/i18n/hu/libbatteryapplet.ts
+++ b/i18n/hu/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Töltés</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Elem állapot:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Jó</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Alacsony</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Nagyon alacsony</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritikus</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Tartalékelemen</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Hálózati töltőn</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Külső áramellátás megszűnt</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nem tudom megnyitni a fájlt</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Mindkét eszközt töltöm</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Nincs elemet tartalmazó kabát a gépen</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libliquid.ts b/i18n/hu/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/hu/libliquid.ts
+++ b/i18n/hu/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libmemoryapplet.ts b/i18n/hu/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/hu/libmemoryapplet.ts
+++ b/i18n/hu/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libopiecore2.ts b/i18n/hu/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/hu/libopiecore2.ts
+++ b/i18n/hu/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libopieobex.ts b/i18n/hu/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/hu/libopieobex.ts
+++ b/i18n/hu/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libscreenshotapplet.ts b/i18n/hu/libscreenshotapplet.ts
index ded2f36..b32ed89 100644
--- a/i18n/hu/libscreenshotapplet.ts
+++ b/i18n/hu/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/hu/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/hu/libtodaydatebookplugin.ts
+++ b/i18n/hu/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/odict.ts b/i18n/hu/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/hu/odict.ts
+++ b/i18n/hu/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/opieirc.ts b/i18n/hu/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/hu/opieirc.ts
+++ b/i18n/hu/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/hu/sysinfo.ts
index bddd9a6..4fbe4c2 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -1,358 +1,373 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Compact Flash memóriakártyán.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi tárhely van felhasználva ezen merevlemezen.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Secure Digital memóriakártyán.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva a beépített (Flash) memóriából ezen az kéziszámítógépen.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva az ideiglenes RAM diszken.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Alkalmazás CPU használat (%)</translation>
+        <translation type="obsolete">Alkalmazás CPU használat (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Rendszer CPU használat (%)</translation>
+        <translation type="obsolete">Rendszer CPU használat (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Típus:</translation>
+        <translation type="obsolete">Típus:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
+        <translation type="obsolete">Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Átmeneti tár (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gyorsítótár (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Szabad (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Teljes memória: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Használat#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ez a lista a kernelbe jelenleg betöltött modulokat mutatja.
 
 Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modulról vagy eltávolítsa azt.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Válasszon ki itt egy parancsot és bökjön a jobboldali Küld gombra, hogy a parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Bökjön ide, hogy a kiválasztott parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ez a terület részletes információkat mutat erről a modulról.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Elérhető (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>:%1 kB</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Parancs</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ez kéziszámítógépen futó processzek listája.
 
 Bökjön a processzre és tartsa, hogy további információkat kapjon a processzről, vagy jelzést küldjön annak.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Válasszon egy jelzést itt, majd bökjön a jobboldali Küld gombra, hogy elküldje a processznek.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Bökjön ide, hogy elküldje a kiválasztott jelzést ennek a processznek.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ez a terület részletes információkat mutat erről a processzről.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Rendszer Információ</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Tároló</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processzek</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modulok</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Fordította:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Magyar fordítás: Czakó Krisztián (slapic@linux.co.hu)
 &lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Készült:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Ez a lap mutatja a gépen futó Opie, a Linux Kernel és a disztribúció verzióit.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index b64399d..61eecfc 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Ma</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Tulajdonos:</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Kérem töltse ki a névjegyét</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nincs aktivált kiegészítő</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Bökjön ide a hozzárendelt program indításához</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Készítette Maximilian Reiß</translation>
+        <translation type="obsolete">Készítette Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Bökjön ide a beállításhoz</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Mely kiegészítő milyen sorrendben töltödjön be:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mozgasd fel</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mozgasd le</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktív/sorrend</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Ikszelje be a négyzetet a kiegészítő aktiválásához vagy használja a jobboldali nyilakat a sorrend beállításához</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">Hány percig kell a PDA-nak felfüggesztve lennie mielőtt az automatikus indítás létrejön bekapcsoláskor</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">perc iniaktivitás</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">Az ikon méretét állítja be pixelben</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">másodperc</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">soha</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">Milyen gyakran frissítse a Ma önmagát</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/zsafe.ts b/i18n/hu/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/hu/zsafe.ts
+++ b/i18n/hu/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/bluepin.ts b/i18n/it/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/it/bluepin.ts
+++ b/i18n/it/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/bluetooth-manager.ts b/i18n/it/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/it/bluetooth-manager.ts
+++ b/i18n/it/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/calculator.ts b/i18n/it/calculator.ts
index a37db43..2dd9caa 100644
--- a/i18n/it/calculator.ts
+++ b/i18n/it/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>C</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calcolatrice</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index 61a6ef1..ed59528 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -1,647 +1,655 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nuova nota spese</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Movimenti</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafici</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Inserisci qui il nome della nota spese.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleziona qui il tipo di nota spese.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banca:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Inserisci qui il nome della banca per questa nota spese.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numero conto:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Inserisci qui il numero di conto per questa nota spese.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numero PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Inserisci qui il numero PIN per questa nota spese.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo iniziale:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Inserisci qui il saldo iniziale per questa nota spese.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Inserisci qui ulteriori informazioni necessarie per questa nota spese.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Questa è una lista di tutti i movimenti inseriti per questa nota spese.
 
 Per ordinarla per un campo specifico, Premi sul nome della colonna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Importo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Premi qui per aggiungere un nuovo movimento.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleziona un movimento e Premi qui per modificarlo.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleziona una nota spese e Premi qui per eliminarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleziona il grafico desiderato e Premi sul pulsante Disegna.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Premi qui per selezionare il tipo di grafico desiderato.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo del conto</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Prelievi per categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depositi per categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Disegna</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Premi qui per disegnare il grafico selezionato.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Elimina movimento</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protetta da password</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Premi qui per abilitare/disabilitare la protezione con password per questa nota spese.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prego conferma la tua password:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prego inserisci la tua password per confermare l&apos;eliminazione della protezione con password:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configura Nota Spese</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Inserisci simbolo valuta:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Inserisci qui il tuo simbolo valuta.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra quando una nota spese è protetta
 da password</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Premi qui per selezionare se nella finestra principale verrà o no mostrato se la nota spese è protetta da password.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostra i saldi delle note spese</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Premi qui per selezionare se nella finestra principale verranno o no mostrati i saldi di ogni nota spese.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Premi per creare una nuova nota spese.
 
 Puoi anche selezionare Nuova dal menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleziona una nota spese e Premi qui per modificarla.
 
 Puoi anche selezionare Modifica dal menu, o Premi e tieni premuto sul nome della nota spese.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleziona un movimento e Premi qui per eliminarlo.
 
 Puoi anche selezionare Elimina dal menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Questa è la lista di tutte le note spese attualmente disponibili.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Elimina nota spese</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome Nota Spese</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Risparmio</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Deposito</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Mercato finanziario</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Altro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Carburante</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viaggio</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Parente</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Spese Varie</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Movimento per </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Prelievo</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleziona qui se il movimento è un prelievo o un deposito.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Deposito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleziona qui la data del movimento.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numero:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Inserisci qui il numero del conto.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Inserisci qui la descrizione del movimento.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleziona qui la categoria del movimento.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleziona qui il tipo di movimento.
 
 Le opzioni disponibili variano a seconda se il movimento è un deposito o un prelievo.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Inserisci qui l&apos;importo del movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tassa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Inserisci ogni tassa associata a questo movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Inserisci qui ogni altra informazione per questo movimento.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carta di Credito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contante</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index e81f848..bfe8312 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -151,680 +151,692 @@ Uscire comunque?</translation>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Trasmetti questa occorrenza</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Inizio visualizzazione eventi</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Ora inizio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Impostazioni Allarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Regolazione Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stile riga:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Viste</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista predefinita:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Vai all&apos;orario corrente</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostra orario</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inizio-Fine</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">LMMGVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Copia</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Trasmetti via IrDA</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ripeti...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Giornalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Settimanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensilmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Mai...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nuovo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ubicazione</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Appuntamento</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pranzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaggio</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inizio - Fine </translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Gen 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Ora inizio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso orario</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> minuti</translation>
+        <translation type="obsolete"> minuti</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ripetuto</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Non Ripetere...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">giorni</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Modifica Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pranzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>th</source>
         <translation>°</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Non Ripetere</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>giorno(i)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>anno(i)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>week</source>
         <translation>settimana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>on </source>
         <translation>su </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fino Al:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mesi</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anni</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index 33a3697..3777f31 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -1,250 +1,254 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi Suggeriti&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista Comandi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Visualizza lista comandi</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Nascondi lista comandi</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde su Nero</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Nero su Bianco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bianco su Nero</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde su Giallo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blu su Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta su Blu</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan su Bianco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bianco su Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blu su Nero</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spazio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Disattiva</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra di Scorrimento</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Visualizza Lista Comandi</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>A Capo</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usa Beep</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Inserisci comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Inserisci comando da aggiungere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/go.ts b/i18n/it/go.ts
index c6bec7b..1cff274 100644
--- a/i18n/it/go.ts
+++ b/i18n/it/go.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nuova Partita</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passa</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Abbandona</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Due giocatori</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Partita</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Bianco %1, Nero %2. </translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Bianco vince.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Nero vince.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Pareggio.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Passo</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prigionieri: nero %1, bianco %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/gutenbrowser.ts b/i18n/it/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/it/gutenbrowser.ts
+++ b/i18n/it/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libaboutapplet.ts b/i18n/it/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/it/libaboutapplet.ts
+++ b/i18n/it/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index 4f4afba..4abf05a 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -1,87 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>In carica</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Stato batteria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Buono</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Molto Basso</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Carica di riserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentazione esterna inserita</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentazione esterna disinserita</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>impossibile aprire il file</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>In carica entrambi gli apparecchi</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Jacket con batteria non inserito</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libliquid.ts b/i18n/it/libliquid.ts
index 4f54445..80c83ba 100644
--- a/i18n/it/libliquid.ts
+++ b/i18n/it/libliquid.ts
@@ -1,69 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libmemoryapplet.ts b/i18n/it/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/it/libmemoryapplet.ts
+++ b/i18n/it/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libopiecore2.ts b/i18n/it/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/it/libopiecore2.ts
+++ b/i18n/it/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopieobex.ts b/i18n/it/libopieobex.ts
index 5c031ca..d64dc64 100644
--- a/i18n/it/libopieobex.ts
+++ b/i18n/it/libopieobex.ts
@@ -1,77 +1,140 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Ricevuto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accetta</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Hai ricevuto un file del tipo %1 (&lt;img src=&quot;%2&quot;&gt; )Cosa vuoi fare?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Invio:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Invio:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Fatto</translation>
+        <translation type="obsolete">Fatto</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa non abilitato!</translation>
+        <translation type="obsolete">IrDa non abilitato!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Ricerca dispositivi IrDa.</translation>
+        <translation type="obsolete">Ricerca dispositivi IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth non disponibile</translation>
+        <translation type="obsolete">Bluetooth non disponibile</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Ricerca dispositivi bluetooth.</translation>
+        <translation type="obsolete">Ricerca dispositivi bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Pianificazione per invii.</translation>
+        <translation type="obsolete">Pianificazione per invii.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Premi per inviare</translation>
+        <translation type="obsolete">Premi per inviare</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Inviato</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallito</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Tentativo %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Ricerca ancora per IrDa.</translation>
+        <translation type="obsolete">Ricerca ancora per IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Inizia invio</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libscreenshotapplet.ts b/i18n/it/libscreenshotapplet.ts
index 56fef4c..102bcf6 100644
--- a/i18n/it/libscreenshotapplet.ts
+++ b/i18n/it/libscreenshotapplet.ts
@@ -1,58 +1,58 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Nome dello screenshot</translation>
+        <translation type="obsolete">Nome dello screenshot</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Ritardo</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Salva con nome</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Salva screenshot come...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation></translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Screenshot trasferito su %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/it/libtodaydatebookplugin.ts
index 549b468..6e0a12b 100644
--- a/i18n/it/libtodaydatebookplugin.ts
+++ b/i18n/it/libtodaydatebookplugin.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[con allarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>Configurazione Plugin Agenda</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostra luogo</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Nostra note</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Mostra solo appuntamenti successivi</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Spunta se devono essere mostrati solo i successivi appuntamenti</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostra orario in linee extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Quanti appuntamenti devono essere mostrati?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>solo oggi</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Quanti altri giorni devono essere nel campo</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Quanti altri giorni</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Plugin Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Nessun altro appuntamento oggi</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Nessun appuntamento oggi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/odict.ts b/i18n/it/odict.ts
index ffdb0e7..175f011 100644
--- a/i18n/it/odict.ts
+++ b/i18n/it/odict.ts
@@ -1,112 +1,120 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Metodo di ricerca</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Cambia</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>Dizionario Opie</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Query:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Metodi di ricerca</translation>
+        <translation type="obsolete">Metodi di ricerca</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>C&amp;ase sensitive</translation>
+        <translation type="obsolete">C&amp;ase sensitive</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parametro</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Nessun dizionario definito</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definiscine uno</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Dizionario Opie</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>File dizionario</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Ricerca</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Linguaggio 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Linguaggio 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nuovo Metodo di ricerca</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Cambia Metodo di ricerca</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opieirc.ts b/i18n/it/opieirc.ts
index b9e65ad..992417c 100644
--- a/i18n/it/opieirc.ts
+++ b/i18n/it/opieirc.ts
@@ -2,721 +2,732 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>In conversazione nel canale</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Tema del canale</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Digita qui il tuo messaggio per partecipare alla discussione nel canale</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Connesso, accesso in corso ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Accesso avvenuto.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Errore di socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connessione terminata</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Connessione ad un canale inesistente - non sicronizzato?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Utente già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Sei già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Utente non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Canale non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Messaggio al canale con mittente sconosciuto</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Ricevuto PRIVMSG di tipo sconosciuto</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Utente sconsciuto uscito - non sincronizzato?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>modifica tema con</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Tema canale sconosciuto - non sincronizzato?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Ricevuto un CTCP PING da </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con destinatario errato</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Tipo sconosciuto per cambio modalità</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio modalità con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio modalità con parametro sconosciuto</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio modalità con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modalità dell&apos;utente non ancora supportati</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Sei stato scacciato da </translation>
     </message>
     <message>
         <source> by </source>
         <translation> da </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation> è stato scacciato da </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Utente sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Canale sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Messaggio server con canale sconosciuto</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Sei entrato nel canale </translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Questo nickname è già utilizzato, riconnettersi utilizzando un nickname diverso</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Nickname sconosciuto</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Ricevuto comando numerico sconosciuto: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Ricevuto comando ctcp sconosciuto: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Ricevuto comando alfabetico sconosciuto: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 è entrato nel canale %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Hai lasciato il canale %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 ha lasciato il canale %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Messaggio canale con canale sconosciuto %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 è uscito (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>In conversazione con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Conversazione privata</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Digita qui il tuo messaggio da inviare ad un&apos;altra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nome profilo :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Il nome del profilo di questo server</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostname :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Il server a cui connettersi - può essere un qualunque IP o nome host valido</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Porta :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>La porta del server a cui connettersi. Normalmente la 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Nickname :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Il tuo alias sul network IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nome reale :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Il tuo nome reale</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Password :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>La password per connettersi al server (se richiesta)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canali :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista di tutti i canali (separati da virgola) a cui vuoi connetterti automaticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Modifica informazioni del server</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>E&apos; richiesto un nome profilo</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>E&apos; richiesto un hostname</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>E&apos; richiesto un nickname</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>La lista canali contine una lista di canali
+        <translation type="obsolete">La lista canali contine una lista di canali
 separati da virgola che iniziato con &apos;#&apos;
 o &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Browser lista server</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Seleziona un profilo server</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleziona da questa lista un profilo server e premi OK in alto a destra</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Elimina il profilo server corrente</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Modifica il profilo server corrente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Aggiungi un nuovo profilo server</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Messaggi del server</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Digita qui i comandi. Nella guida di OpieIRC puoi trovare una lista di comandi disponibili</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">Sei conosciuto ora come %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Nickname di un utente sconosciuto modificato</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 è ora conosciuto come %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Linee visualizzate :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Numero di righe visualizzate nelle chat prima che le righe più vecchie vengano cancellate - è necessario per limitare l&apos;occupazione di memoria. Imposta a 0 se non ne hai bisogno</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Colore sfondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Colore dello sfondo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Colore testo normale :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Colore del testo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Colore errore :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Colore da utilizzare per visualizzare gli errori</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Testo scritto da te :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto da te</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Testo scritto da altri :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto da altri</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Testo scritto dal server :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Colore da utilizzare per evidenziare il testo scritto dal server</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notifiche :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Colore da utilizzare per evidenziare le notifiche</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descrizione mancante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descrizione del contenuto del tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Chiudi questo tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Connessioni al server, canali, query ed altre cose saranno posizionate qui</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nuova connessione</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crea una nuova connessione ad un server IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configura impostazioni di OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index eab41f6..9b28fd3 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -1,358 +1,373 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Questo grafico rappresenta quanta memoria di questa scheda Compact Flash è attualmente utilizzata.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Questo grafico rappresenta quanto spazio di questo disco rigido è attualmente utilizzato.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Questo grafico rappresenta quanta memoria di questa scheda Secure Digital è attualmente utilizzata.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Questo grafico rappresenta quanta memoria interna (es. memoria Flash) è attualmente utilizzata su questo dispositivo portatile.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Questo grafico rappresenta quanta memoria del disco RAM è attualmente utilizzata.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Utilizzo CPU applicazione (%)</translation>
+        <translation type="obsolete">Utilizzo CPU applicazione (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Utilizzo CPU sistema (%)</translation>
+        <translation type="obsolete">Utilizzo CPU sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Tipo: </translation>
+        <translation type="obsolete">Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
+        <translation type="obsolete">Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libera (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria Totale: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Questa è una lista di tutti i moduli del kernel attualmente caricati su questo dispositivo portatile.
 
 Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per scaricarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selezionare qui un comando e premere il pulsante Invia sulla destra per inviare il comando al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Premere qui per inviare il comando selezionato al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo modulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Utilizzato da</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponibile (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Questo è l&apos;elenco di tutti i processi su questo dispositivo portatile.
 
 Tenere premuto sul nome di un processo per vedere ulteriori informazioni, o per inviargli un segnale.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selezionare qui un segnale e premere il pulsante Invia sulla destra per inviarlo al processo.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Premere qui per inviare il segnale selezionato a questo processo.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo processo.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Storage</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processi</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilato da: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilato il: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Questa pagina mostra le versioni correnti di Opie, del kernel di Linux e della distribuzione in esecuzione su questo dispositivo portatile.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index 4f754d1..3f6f35e 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -1,143 +1,147 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Oggi</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Proprietà di</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Inserisci i tuoi dati personali</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nessun plugin attivato</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Premi qui per lanciare l&apos;app. associata</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Oggi by Maximilian Reiß</translation>
+        <translation type="obsolete">Oggi by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Premi qui per andare alle impostazioni</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Carica i plugin nell&apos;ordine:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Muovi Giù</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>attivo/ordine</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Premi per attivare/disattivare un plugin o utilizza le frecce a destra per cambiare l&apos;ordine di visualizzazione</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configurazione</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Premi qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autostart al riavvio?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>banner piccolo</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Imposta banner piccolo</translation>
     </message>
     <message>
         <source> min</source>
         <translation> min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Quanti minuti il PDA deve rimanere spento prima che entri in funzione la funzione autostart al riavvio</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minuti inattivi</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation> pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Imposta la dimensione dell&apos;icona in pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>dimensione icona</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>mai</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Quanto spesso Oggi deve aggiornarsi</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>aggiorna</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/zsafe.ts b/i18n/it/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/it/zsafe.ts
+++ b/i18n/it/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/bluepin.ts b/i18n/ja/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/ja/bluepin.ts
+++ b/i18n/ja/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/bluetooth-manager.ts b/i18n/ja/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/ja/bluetooth-manager.ts
+++ b/i18n/ja/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/calculator.ts b/i18n/ja/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/ja/calculator.ts
+++ b/i18n/ja/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/checkbook.ts b/i18n/ja/checkbook.ts
index 2cdb02b..dafff9b 100644
--- a/i18n/ja/checkbook.ts
+++ b/i18n/ja/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index cb64e37..669dcab 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -144,680 +144,688 @@ Quit anyway?</source>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/embeddedkonsole.ts b/i18n/ja/embeddedkonsole.ts
index 8658bbc..c64ebf8 100644
--- a/i18n/ja/embeddedkonsole.ts
+++ b/i18n/ja/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/go.ts b/i18n/ja/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/ja/go.ts
+++ b/i18n/ja/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/gutenbrowser.ts b/i18n/ja/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/ja/gutenbrowser.ts
+++ b/i18n/ja/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libaboutapplet.ts b/i18n/ja/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/ja/libaboutapplet.ts
+++ b/i18n/ja/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libbatteryapplet.ts b/i18n/ja/libbatteryapplet.ts
index aeb2c4a..b2e341e 100644
--- a/i18n/ja/libbatteryapplet.ts
+++ b/i18n/ja/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libliquid.ts b/i18n/ja/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/ja/libliquid.ts
+++ b/i18n/ja/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libmemoryapplet.ts b/i18n/ja/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/ja/libmemoryapplet.ts
+++ b/i18n/ja/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libopiecore2.ts b/i18n/ja/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/ja/libopiecore2.ts
+++ b/i18n/ja/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libopieobex.ts b/i18n/ja/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/ja/libopieobex.ts
+++ b/i18n/ja/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libscreenshotapplet.ts b/i18n/ja/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/ja/libscreenshotapplet.ts
+++ b/i18n/ja/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/ja/libtodaydatebookplugin.ts
index 00283f7..2090513 100644
--- a/i18n/ja/libtodaydatebookplugin.ts
+++ b/i18n/ja/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/odict.ts b/i18n/ja/odict.ts
index 88ebad1..a021376 100644
--- a/i18n/ja/odict.ts
+++ b/i18n/ja/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ase sensitive</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Search methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/opieirc.ts b/i18n/ja/opieirc.ts
index fb55663..9e54837 100644
--- a/i18n/ja/opieirc.ts
+++ b/i18n/ja/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/ja/sysinfo.ts
index 3528d42..c5017ae 100644
--- a/i18n/ja/sysinfo.ts
+++ b/i18n/ja/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/today.ts b/i18n/ja/today.ts
index 60233b2..cf928b2 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/zsafe.ts b/i18n/ja/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/ja/zsafe.ts
+++ b/i18n/ja/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/bluepin.ts b/i18n/ko/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/ko/bluepin.ts
+++ b/i18n/ko/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/bluetooth-manager.ts b/i18n/ko/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/ko/bluetooth-manager.ts
+++ b/i18n/ko/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/calculator.ts b/i18n/ko/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/ko/calculator.ts
+++ b/i18n/ko/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/checkbook.ts b/i18n/ko/checkbook.ts
index 2cdb02b..dafff9b 100644
--- a/i18n/ko/checkbook.ts
+++ b/i18n/ko/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index cb64e37..669dcab 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -144,680 +144,688 @@ Quit anyway?</source>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/embeddedkonsole.ts b/i18n/ko/embeddedkonsole.ts
index 8658bbc..c64ebf8 100644
--- a/i18n/ko/embeddedkonsole.ts
+++ b/i18n/ko/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/go.ts b/i18n/ko/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/ko/go.ts
+++ b/i18n/ko/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/gutenbrowser.ts b/i18n/ko/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/ko/gutenbrowser.ts
+++ b/i18n/ko/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libaboutapplet.ts b/i18n/ko/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/ko/libaboutapplet.ts
+++ b/i18n/ko/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libbatteryapplet.ts b/i18n/ko/libbatteryapplet.ts
index aeb2c4a..b2e341e 100644
--- a/i18n/ko/libbatteryapplet.ts
+++ b/i18n/ko/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libliquid.ts b/i18n/ko/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/ko/libliquid.ts
+++ b/i18n/ko/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libmemoryapplet.ts b/i18n/ko/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/ko/libmemoryapplet.ts
+++ b/i18n/ko/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libopiecore2.ts b/i18n/ko/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/ko/libopiecore2.ts
+++ b/i18n/ko/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libopieobex.ts b/i18n/ko/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/ko/libopieobex.ts
+++ b/i18n/ko/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libscreenshotapplet.ts b/i18n/ko/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/ko/libscreenshotapplet.ts
+++ b/i18n/ko/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/ko/libtodaydatebookplugin.ts
index 00283f7..2090513 100644
--- a/i18n/ko/libtodaydatebookplugin.ts
+++ b/i18n/ko/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/odict.ts b/i18n/ko/odict.ts
index 88ebad1..a021376 100644
--- a/i18n/ko/odict.ts
+++ b/i18n/ko/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ase sensitive</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Search methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/opieirc.ts b/i18n/ko/opieirc.ts
index fb55663..9e54837 100644
--- a/i18n/ko/opieirc.ts
+++ b/i18n/ko/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/ko/sysinfo.ts
index 3528d42..c5017ae 100644
--- a/i18n/ko/sysinfo.ts
+++ b/i18n/ko/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 60233b2..cf928b2 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/zsafe.ts b/i18n/ko/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/ko/zsafe.ts
+++ b/i18n/ko/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/bluepin.ts b/i18n/lv/bluepin.ts
index 28de9e6..61dc45f 100644
--- a/i18n/lv/bluepin.ts
+++ b/i18n/lv/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Lūdzu ievadiet pin</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Lūdzu ievadiet PIN:</translation>
+        <translation type="obsolete">Lūdzu ievadiet PIN:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Saglabāt pin</translation>
+        <translation type="obsolete">Saglabāt pin</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Labi</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Atlikt</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Izejošais savienojums uz</translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Īenākošais savienojums no</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/bluetooth-manager.ts b/i18n/lv/bluetooth-manager.ts
index d314d39..65a8269 100644
--- a/i18n/lv/bluetooth-manager.ts
+++ b/i18n/lv/bluetooth-manager.ts
@@ -1,339 +1,367 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Bluetooth Menedžeris</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Iekārtas nosaukums &quot; &lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>MAC adrese:</translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Klase</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Izmaiņas uzstādītas.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>pārskanēt servisus</translation>
+        <translation type="obsolete">pārskanēt servisus</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>uz grupu</translation>
+        <translation type="obsolete">uz grupu</translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>dzēst</translation>
+        <translation type="obsolete">dzēst</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Test1:</translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>servisi nav atrasti</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Nav atrastas konekcijas</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Forma1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Iekārtas</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Iekārtas Nosaukums</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Tiešsaistē</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Skanēt Iekārtas</translation>
+        <translation type="obsolete">Skanēt Iekārtas</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Savienojumi</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Savienojumu tips</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Signāls</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfigurācija</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Bluetooth Pamata Konfigurācija</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Noklusētais Atslēgvārds</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>atļaut autentifikāciju</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>atļaut kriptēšanu</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation>Atļaut lapu skanēšanu</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation>Atļaut Meklēšanas skanēšanu</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Uzstādīt</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Rfcomm Saistību Tabula</translation>
+        <translation type="obsolete">Rfcomm Saistību Tabula</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statuss</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Statusa Etiķete</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation>Bluetooth Bāzes Konfigurācija</translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Forma2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Iekārtasvārds</translation>
+        <translation type="obsolete">Iekārtasvārds</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Servisi</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>mainīt uzstādījumus</translation>
+        <translation type="obsolete">mainīt uzstādījumus</translation>
     </message>
     <message>
         <source>active</source>
         <translation>aktīvs</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>servisa nosaukums</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Mainīt iekārtas vārdu</translation>
+        <translation type="obsolete">Mainīt iekārtas vārdu</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>Noklusētais PIN 
+        <translation type="obsolete">Noklusētais PIN 
 Kods</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informācija</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>TextEtiķete9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>savienot</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>savienot+konf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>atvienot</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>bīmot failus</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Kurš fails jābīmo?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Iekārtu skanēšana</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Sākt skanēšanu</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Pievienot Iekārtu</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Pārtraukt skanēšanu</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>ppp savienojums</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>Ievadiet ppp skripta nosaukumu:</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Savienot</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>savienot</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>savienot+konf</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>atvienot</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Rfcomm Saistības</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Sasaistīt iekārtu ar interfeisu</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Forma2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>Mak</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Kanāls</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation></translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
     <message>
         <source>3</source>
         <translation></translation>
     </message>
     <message>
         <source>4</source>
         <translation></translation>
     </message>
     <message>
         <source>5</source>
         <translation></translation>
     </message>
     <message>
         <source>6</source>
         <translation></translation>
     </message>
     <message>
         <source>7</source>
         <translation></translation>
     </message>
     <message>
         <source>8</source>
         <translation></translation>
     </message>
     <message>
         <source>9</source>
         <translation></translation>
     </message>
     <message>
         <source>10</source>
         <translation></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentārs:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/calculator.ts b/i18n/lv/calculator.ts
index 3d7116d..55cbef4 100644
--- a/i18n/lv/calculator.ts
+++ b/i18n/lv/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Kalkulators</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standarta</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standarta</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Smagums</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Attālums</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Laukums</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatūras</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Tilpums</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akri</translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation>karāti</translation>
     </message>
     <message>
         <source>cm</source>
         <translation></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation></translation>
     </message>
     <message>
         <source>ft</source>
         <translation></translation>
     </message>
     <message>
         <source>g</source>
         <translation></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektāri</translation>
     </message>
     <message>
         <source>in</source>
         <translation></translation>
     </message>
     <message>
         <source>kg</source>
         <translation></translation>
     </message>
     <message>
         <source>km</source>
         <translation></translation>
     </message>
     <message>
         <source>l</source>
         <translation></translation>
     </message>
     <message>
         <source>lb</source>
         <translation></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tonnas</translation>
     </message>
     <message>
         <source>m</source>
         <translation></translation>
     </message>
     <message>
         <source>mg</source>
         <translation></translation>
     </message>
     <message>
         <source>mi</source>
         <translation></translation>
     </message>
     <message>
         <source>ml</source>
         <translation></translation>
     </message>
     <message>
         <source>mm</source>
         <translation></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation></translation>
     </message>
     <message>
         <source>oz</source>
         <translation></translation>
     </message>
     <message>
         <source>points</source>
         <translation>punkti</translation>
     </message>
     <message>
         <source>pt</source>
         <translation></translation>
     </message>
     <message>
         <source>qt</source>
         <translation></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>kv cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>kv p</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>kv in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>kv km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>kv m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>kv mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>kv mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>kv j</translation>
     </message>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>ēdamkarote</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>tējkarote</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>tonnas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jardi</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/checkbook.ts b/i18n/lv/checkbook.ts
index 28442a7..b5bc635 100644
--- a/i18n/lv/checkbook.ts
+++ b/i18n/lv/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekugrāmata</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Jauna Čeku grāmata</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Tranzakcijas</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafiki</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Paroles aizsardzība</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klikšķiniet šeit lai izslēgtu/ieslēgtu paroles aizsardzību šajā čeku grāmatiņā.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nosaukums:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Ievadiet čeku grāmatiņas nosaukumu.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tips:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Izvēlaties čeku grāmatiņas tipu.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banka:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Ievadiet bankas nosaukumu čeku grāmatiņai.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Konta nummurs:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Ievadiet konta nummuru šai čeku grāmatiņai.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Ievadiet čeku grāmatiņas PIN kodu.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Sākuma atlikums:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Ievadied čeku grāmatiņas sākuma bilanci.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Ievadiet jebkuru papildus informāciju par čeku grāmatiņu.</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Kārtot pēc:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Izvēlaties čeku grāmatiņas kārtošanu.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Ierakstu Kārtība</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Numurs</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Šis ir visu čeku grāmatiņā ierakstīto transakciju saraksts.
 
 Lai sakārtotu ierakstus pēc kāda lauka, klikšķiniet uz kolonas vārda.</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>SortDatums</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Summa</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilance</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klikšķiniet šeit, lai pievienotu jaunu transakciju.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Izvēlaties tranzakciju un tad klikšķiniet šeit, lai to labotu.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Izvēlaties čeku grāmatiņu un tad klikšķiniet šeit, lai to dzēstu.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Klikšķiniet uz izvēlētā grafika zemāk un tad klikšķiniet uz Zīmēt pogas.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klikšķiniet šeit lai norādītu izvēlēto grafika tipu.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Konta bilance</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Izņemšana pēc kategorijas</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Ienākumi pēc kategorijas</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Zīmēt</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klikšķiniet šeit lai zīmētu izvēlēto grafiku.</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Ievadiet paroli</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Lūdzu ievadiet savu paroli:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Apstiprini paroli</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Lūdzu apstipriniet paroli:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Lūdzu ievadiet paroli, lai apstiprininātu paroles aizsardzības noņemšanu:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Dzēst tranzakciju</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigurēt Čeku Grāmatiņu</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Iestatījumi</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Jauns Konta Tips</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Kontu Tipi</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Jauna Kategorija</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Izdevumi</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Ienākumi</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorijas</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Maksātājs</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Jauns Maksātājs</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Maksātāji</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Ievadiet valūtas simbolu:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Šeit ievadiet jūsu lokālās valūtas apzīmējumu.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Rādīt vai čeku grāmatiņa ir aizsargāta
 ar paroli</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klikšķiniet šeit, lai izvēlētos vai galvenais logs attēlo vai dotā čeku grāmatiņa ir aizsargāta ar paroli vai nē.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Rādīt čeku grāmatiņas bilances</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klikšķiniet šeit, lai izvēlētos vai galvenais logs rādīs tekošo bilanci katrai čeku gramatiņai.</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Atvērt pēdējo čeku grāmatiņu</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Klikšķiniet šeit lai izvēlētos vai atvērt pēdējo čeku grāmatiņu startējot.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Rādīt pēdējo čeku grāmatiņu</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Klikšķiniet lai tiktu parādīts čeku grāmatiņas pēdējais tabs.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Saglabat aprakstu kā maksātāju</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Klikšķiniet šeit lai saglabātu jaunos aprakstus maksātāju sarakstā.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Čeku grāmatiņa</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klikšķiniet šeit lai izveidotu jaunu čeku grāmatiņu.
 
 Jūs arī variet izvēlēties Jauns no Čeku grāmatiņas izvēlnes.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Izvēlaties čeku grāmatiņu un klikšķiniet lai to labotu.
 
 Jūs arī variet izvēlēties Čeku grāmatiņas izvēlnes komdandu Labot, vai arī klikšķināt un pieturēt uz čeku grāmatiņas nosaukuma.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Izvēlaties čeku grāmatiņu un klikšķiniet uz tās lai to dzēstu.
 
 Jūs variet izdarīt to pašu ar izvēlnes Checkbook komandu Delete.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurēt</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klikšķiniet šeit lai konfigurētu aplikāciju.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Šis ir visu pieejamo čeku grāmatiņu saraksts.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Čeku grāmatiņas nosaukums</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Ievadiet paroli</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Lūdzu ievadiet paroli:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Dzēst čeku grāmatiņu</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Ietaupījumi</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Čeki</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Naudas tirgus</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Savstarpējs fonds</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Cits</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Izdevumi</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rēķini</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>Cd</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Apģērbs</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Dators</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Izklaide</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Ēdiens</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Benzīns</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filmas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Īre</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Ceļojumi</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Ienākumi</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Darbs</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Ģimenes Loceklis</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Daž. Kredīti</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Pārvedums priekš</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Izņemšana</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Izvēlaties vai pārvedums ir naudas izņemšana vai  depozīts.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depozīts</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datums:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Izvēlaties pārveduma datumu.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numurs:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Ievadiet čeka numuru.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Apraksts:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Ievadiet pārskaitījuma aprakstu.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Izvēlaties pārveduma kategoriju.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tips:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Izvēlaties pārveduma tipu.
 
 Pieejamās opcijas ir bāzētas uz pārvedumu kā iemaksu vai naudas izņemšanu.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Daudzums:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Ievadiet pārveduma daudzumu.
 
 Ievadītajai vērtībai vienmēr jābūt pozitīvai.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Pakalpojuma proc.:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Ievadiet izdevumus kas saistīti ar pārvedumu.
 
 Ievadītai vērtībai vienmēr jābūt pozitīvam skaitlim.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Ievadiet jebkuru pārveduma papildus informāciju.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Debeta Maksa</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Rakstīts Čeks</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Pārskaitījums</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kredīt Karte</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Automātiskais Maksājums</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Skaidra Nauda</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/datebook.ts b/i18n/lv/datebook.ts
index db5a93f..ac7ea64 100644
--- a/i18n/lv/datebook.ts
+++ b/i18n/lv/datebook.ts
@@ -152,680 +152,692 @@ Vai Pārtraukt?</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Šis ir vairāku dienu notikums.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Sākums</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Beigas</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source> - </source>
         <translation></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>
 Labot</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicēt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Bīmot</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Bīmot šo ierakstu</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation></translation>
     </message>
     <message>
         <source>PM</source>
         <translation></translation>
     </message>
     <message>
         <source>AM</source>
         <translation></translation>
     </message>
     <message>
         <source>:00</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Parametri</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Skati</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Noklusētais skats:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Diena</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Nedēļa</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Nedēļas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mēnesis</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Pārvietoties uz tekošo laiku</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Rindas stils:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Noklusēts</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Vidējs</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Liels</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Laika displejs</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Sākums</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Sākums-Beigas</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Atgādinājuma Uzstādījumi</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Atgādinājums Pēc</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minūtes</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Sākt skatīt notikumus</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Sākuma Laiks:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Noklusētie</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Atrašanās:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ofiss</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Mājas</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Šis ir visas dienas notikums.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>n</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>POTCPSSP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>
 Labot</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicēt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Bīmot</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>n</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>N: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Sākuma Laiks</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Beigu Laiks</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendārs</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Atkārtot...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Ik dienas...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Ik nedēļu...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Ik mēnesi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ik gadu...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neatkārtot...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Jauns Notikums</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Atrašanās vieta</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Tikšanās</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pusdienas</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vakariņas</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Ceļojums</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ofiss</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Mājas</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Sākt - Beigt</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Sākuma laiks</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Visu dienu</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Laika zona</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Brīdinājums</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minūtes</translation>
+        <translation type="obsolete">minūtes</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Klusi</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Skaļi</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Atkārtot</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Neatkārtot...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Piezīme...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dienas</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Labot Piezīmi</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pusdienas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Sākt</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Beigt</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Katru</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 katru</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 katru</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 no katra</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Katru</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Pirmodienu</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Otrdienu</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Trešdienu</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Ceturtdienu</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piektdienu</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sestdienu</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Svētdienu</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ais</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ais</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>šais</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ais</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Neatkārtot</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dienu(as)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>nedēļu(as)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Atkārtot Pēc</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dienas</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datuma</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mēnesis(ši)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>gads(i)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dienas</translation>
     </message>
     <message>
         <source>day</source>
         <translation>diena</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>nedēļas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>nedēļa</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mēnesis</translation>
     </message>
     <message>
         <source>year</source>
         <translation>gads</translation>
     </message>
     <message>
         <source> and </source>
         <translation>un</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
  un</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, un</translation>
     </message>
     <message>
         <source>on </source>
         <translation>uz</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Atkārtots Notikums</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dienu</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Nedēļu</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mēnesi</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Gadu</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Katru:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Biežums</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Beigt:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez beigu datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Atkārtot</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pi</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ot</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Tr</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Cet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Sv</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Katru</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Main1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Main 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>NedēļasMain</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mēneši</translation>
     </message>
     <message>
         <source>years</source>
         <translation>gadi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/embeddedkonsole.ts b/i18n/lv/embeddedkonsole.ts
index 8bb3923..de124ce 100644
--- a/i18n/lv/embeddedkonsole.ts
+++ b/i18n/lv/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Komandu Izvēle</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Komandas</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Komandas&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Ieteiktās Komandas&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Termināls</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Komandu Saraksts</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Parādīt komandu sarakstu</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Paslēpt komandu sarakstu</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zaļš uz Melna</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Melns uz Balta</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Balts uz Melna</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zaļš uz Dzēltena</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Zils uz Magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magneta uz Zila</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian uz Balta</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Balts uz Cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Zils uz Melna</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Oranžš uz Melna</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Izvēles</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Krāsas</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Ievadīt</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Atstarpe</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Augšā</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Lejā</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Ievietot</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Ātrā Labošana</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Pa Kreisi</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Pa Labi</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>SkrolRinda</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Pārnest</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Pīkstēt</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Rādīt Komandu Sarakstu</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Paslēpt Komandu Sarakstu</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Apakšā</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Augšā</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Paslēpts</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabi</translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Melns uz Rozā</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Rozā uz Melna</translation>
     </message>
     <message>
         <source>default</source>
         <translation>noklusēts</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>jauna sesija</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Skatīt</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Fonti</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Sessijas</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pilnekrāns</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Palielinājums</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Labot...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>Vēsture...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Lai izietu no pilnekrāna, klikšķiniet šeit.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>Vēstures Rindas:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Komandu Izvēle</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Pievienot komandu</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Ievadiet pievienojamo komandu:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/go.ts b/i18n/lv/go.ts
index 535539c..9164bbb 100644
--- a/i18n/lv/go.ts
+++ b/i18n/lv/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Jauna Spēle</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pasēt</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Atkāpties</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Divu spēlētāju opcija</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spēle</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Baltie %1, Melnie %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Baltie vinē.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Melnie vinē.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Dalīt.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Pasēt</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Cietumnieki: melnie %1, baltie %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/gutenbrowser.ts b/i18n/lv/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/lv/gutenbrowser.ts
+++ b/i18n/lv/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libaboutapplet.ts b/i18n/lv/libaboutapplet.ts
index 973b7ae..127a7aa 100644
--- a/i18n/lv/libaboutapplet.ts
+++ b/i18n/lv/libaboutapplet.ts
@@ -1,99 +1,115 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Par īsinājumikona</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Par</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>Par</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Enviroment&lt;/b&gt; tiek kodē un uztur Opie Komanda, porgrammēšanas inženieri no visas pasaules piedalās tajā ar savu darbu.
 &lt;/p&gt;
 &lt;p&gt;
 Neviena grupa, kompānijas vai organizācija nekontrolē Opie izejas kodu. Visi ir laipni lūgti piedalīties Opie izstrādē.
 &lt;/p&gt;
 &lt;p&gt;
 Apmeklējiet &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; lai saņemtu papildus informāciju par Opie Projektu.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Ziņojiet</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Programmatūru var vienmēr uzlabot, un Opie Komanda ir gatava to darīt.  Tomēr, tev - lietotāj - ir jāinformē ja kaut kas nestrādā kā tam vajadzētu būt vai arī to varētu veikt labāk.&lt;/p&gt;
 &lt;p&gt;Opie sistēmai ir problēmu atsekošanas sisŧēma.  Apmeklējiet &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; lai ziņotu par kļūdām.&lt;/p&gt;
 &lt;p&gt;Ja jums ir uzlabojuma ieteikums jūs variet lietot problēmu atsekošans sistēmu, lai reģistrētu savu vēlmi.  Pārliecinaties, lai prasības līmenis tiktu uzstādīts &quot;Feature Wish&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Pievienoties</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Jums nevajag būt par programmatūras izstrādātāju lai būtu Opie Komandā.  Jūs variet pievienoties tulkotāju komandai, lai tulkotu programmas saskarni.  Jūs variet veidot grafiku, skaņu, tēmas un uzlabotu dokumentāciju.  Tā ir jūsu izvēle!&lt;/p&gt;
 &lt;p&gt;Apmeklējiet &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; lai saņemtu informācijupar projektu kurā ņemt dalību.&lt;/p&gt;
 &lt;p&gt;Ja jums nepieciešama papildus informācija vai dokumentācija, apmeklējiet &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;  un mēs sniegsim jums nepieciešamo informāciju.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation>&lt;p&gt;(new line)
+        <translation type="obsolete">&lt;p&gt;(new line)
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;b&gt;Gints Polis&lt;/b&gt; (gints.polis@cc.lv)&lt;/tt&gt; Latviešu valodas tulkojums&lt;br/&gt;
 &lt;/p&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;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libbatteryapplet.ts b/i18n/lv/libbatteryapplet.ts
index 64c12f5..bcd6d71 100644
--- a/i18n/lv/libbatteryapplet.ts
+++ b/i18n/lv/libbatteryapplet.ts
@@ -1,87 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Problēma</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nevaru atvērt failu</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>nav datu</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Uzlādēju abas iekārtas</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Uzlādēju</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Baterijas statuss:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Labs</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Zems</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Ļoti Zems</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisks</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Aktīva rezerves barošana</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Strāva pieslēgta</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Årējā barošana atslēgta</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Paplašinājums  </translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Nav pieslēgts baterijas papildinājums</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Atlikusi Strāva: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Atlicis Laiks: %1m %2s</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
-        <translation>Atlikusi Strāva: %1 %2
+        <translation type="obsolete">Atlikusi Strāva: %1 %2
 Atlicis Laiks: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
+    <message>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libliquid.ts b/i18n/lv/libliquid.ts
index 1ebab05..68964e5 100644
--- a/i18n/lv/libliquid.ts
+++ b/i18n/lv/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stils</translation>
+        <translation type="unfinished">Liquid Stils</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Necaurspīdīgs</translation>
+        <translation type="unfinished">Necaurspīdīgs</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Fona krāsa</translation>
+        <translation type="unfinished">Fona krāsa</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Pogu krāsa</translation>
+        <translation type="unfinished">Pogu krāsa</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Caurspīdīgs, fona krāsa</translation>
+        <translation type="unfinished">Caurspīdīgs, fona krāsa</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Caurspīdīgs, pogas krāsa</translation>
+        <translation type="unfinished">Caurspīdīgs, pogas krāsa</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Uzstādīta caurspīdība</translation>
+        <translation type="unfinished">Uzstādīta caurspīdība</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Izvēlnes krāsa</translation>
+        <translation type="unfinished">Izvēlnes krāsa</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Teksta krāsa</translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation></translation>
+        <translation type="unfinished">Teksta krāsa</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Lietot ēnotu izvēles tekstu</translation>
+        <translation type="unfinished">Lietot ēnotu izvēles tekstu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Komandpogas parādīt plakanas</translation>
+        <translation type="unfinished">Komandpogas parādīt plakanas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Kontrasts</translation>
+        <translation type="unfinished">Kontrasts</translation>
+    </message>
+    <message>
+        <source>Opacity</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Augstas Kvalitātes Liquid stils, autors - Mosfet</translation>
+        <translation type="unfinished">Augstas Kvalitātes Liquid stils, autors - Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libmemoryapplet.ts b/i18n/lv/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/lv/libmemoryapplet.ts
+++ b/i18n/lv/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libopiecore2.ts b/i18n/lv/libopiecore2.ts
index 5310c66..6638229 100644
--- a/i18n/lv/libopiecore2.ts
+++ b/i18n/lv/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Kalendāra Poga</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Kontakti Poga</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Izvēlnes Poga</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Pasta Poga</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Mājas Poga</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Ieraksta Poga</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Zemākā+Augšā</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Zemāk-Lejā</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Zemāk+Pa labi</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Zemāk+Pa kreisi</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Augstāk+Augšā</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Augstāk+Lejā</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Augstāk+Pa labi</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Augstāk+Pa kreisi</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Darbības Poga</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Labi Poga</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Beigu Poga</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation>Darbi Poga</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Hinge1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Atkritumi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libopieobex.ts b/i18n/lv/libopieobex.ts
index 28df96e..1a5df06 100644
--- a/i18n/lv/libopieobex.ts
+++ b/i18n/lv/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Saņemts:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Akceptēt</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Azliegt</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Jūs saņēmāt failu ar tipu %1 (&lt;img src=&quot;%2&quot;&gt;)Ko jūs vēlaties darīt?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Sūtu:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Sūtu:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Darīts</translation>
+        <translation type="obsolete">Darīts</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa nav ieslēgts!</translation>
+        <translation type="obsolete">IrDa nav ieslēgts!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Meklēju IrDa Iekārtas.</translation>
+        <translation type="obsolete">Meklēju IrDa Iekārtas.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth nav pieejams</translation>
+        <translation type="obsolete">Bluetooth nav pieejams</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Meklēju bluetooth Iekārtas.</translation>
+        <translation type="obsolete">Meklēju bluetooth Iekārtas.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Piesaku bīmošanai.</translation>
+        <translation type="obsolete">Piesaku bīmošanai.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klikšķiniet lai bīmotu</translation>
+        <translation type="obsolete">Klikšķiniet lai bīmotu</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Nosūtīts</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Atteice</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Mēģinājums %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Meklējam IrDa atkārtoti.</translation>
+        <translation type="obsolete">Meklējam IrDa atkārtoti.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Sākt sūtīšanu</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libqpe.ts b/i18n/lv/libqpe.ts
index d316514..b94faa6 100644
--- a/i18n/lv/libqpe.ts
+++ b/i18n/lv/libqpe.ts
@@ -571,421 +571,421 @@ Atbrīvojat nedaudz atmiņas un mēģiniet vēl.</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neaizpildīts</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Darba Adrese:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mājas Adrese:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Epasta Adrese:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Mājas Telefons:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Mājas Fakss:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mājas Mob.:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Mājas lapa:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Biznesa Mājas Lapa:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Offiss:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Biznesa Telefons:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Biznesa Fakss:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Biznesa Mobīlais:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Biznesa Peidžeris:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesija:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asistents:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menedžeris:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Vīrietis</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Sieviete</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Dzimums:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Dzimšanas diena:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Svētku diena:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Niks:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Vārda Nosaukums</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation> </translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Uzvārds</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufikss</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Amats</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departaments</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Biznesa Telefons</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Biznesa Fakss</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Biznesa Mobīlais</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Noklusētais Epasts</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epasti</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Mājas Telefons</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Mājas Fakss</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mājas Mobīlais</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Biznesa Iela</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Biznesa Pilsēta</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Biznesa Rajons</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Biznesa Indekss</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Biznesa Valsts</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Biznesa Peidžeris</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Biznesa WebLapa</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ofiss</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesija</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asistents</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Menedžeris</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Mājas Iela</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Mājas Pilsēta</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Mājas Rajons</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Mājas Indekss</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Mājas Valsts</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished">Cietais Disks</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nepietiek Vietas</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libscreenshotapplet.ts b/i18n/lv/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/lv/libscreenshotapplet.ts
+++ b/i18n/lv/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/lv/libtodaydatebookplugin.ts
index e751760..41f70ff 100644
--- a/i18n/lv/libtodaydatebookplugin.ts
+++ b/i18n/lv/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[ar brīdinājumu]</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Visu dienu</translation>
     </message>
     <message>
         <source>note</source>
         <translation>piezīme</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Rādīt lokāciju</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Atzīmējiet šo ja lokāciju vajag rādīt katram notikumam</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Rādīt piezīmes</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Atzīmējiet šo ja jārāda arī notikuma piezīme</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Rādīt tikai pēdējos notikumus</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Izvēlaties šo ja vajag rādīt tikai nokavētos notikumus</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Rādīt laiku papildrindā</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Cik notikumus rādīt maksimāli.  Datumu secībā</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Cik notikumus rādīt?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>tika šodien</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Cik daudz dienu jābūt intervālā</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Cik daudz dienu</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Kalendāra spraudnis</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Šodien nav notikumu</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Šodien nav notikumu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/odict.ts b/i18n/lv/odict.ts
index 22cf504..84b7d72 100644
--- a/i18n/lv/odict.ts
+++ b/i18n/lv/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Meklēšanas metodes</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Mainīt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Opie-Vārdnīca</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Pieprasījums:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Labi</translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Vārdnīca</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Nav definēta vārdnīca</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definēt</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Atlikt</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Konfigurācija</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Meklēšanas metodes</translation>
+        <translation type="obsolete">Meklēšanas metodes</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Reģistrjūtīgs</translation>
+        <translation type="obsolete">&amp;Reģistrjūtīgs</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parametrs</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Vārds:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Vārdnīcas fails</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Pārlūkot</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Valoda 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Atdalītājs</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Valoda 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Jauna Meklēšanas Metode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Mainīt Meklēšanas Metodi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/opieirc.ts b/i18n/lv/opieirc.ts
index fb55663..9e54837 100644
--- a/i18n/lv/opieirc.ts
+++ b/i18n/lv/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/lv/sysinfo.ts
index b7324c0..1bf5c29 100644
--- a/i18n/lv/sysinfo.ts
+++ b/i18n/lv/sysinfo.ts
@@ -1,366 +1,381 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Šī sadaļa rāda pieejamos testus, veiktajiem testiem tiek parādīts arī rezultāts, un salīdzinājums ar kādu izvēlētu iekārtu.  Lietojiet izvēles rūtiņas lai definētu kurus testus jūs vēlaties izpildīt.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Testi</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Rezultāti</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Salīdzinājums</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Veselo Skaitļu Aritmētika</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Peldošā Komata Vienība</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Teksta Renderēšana</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Gfx Renderēšana</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Veiktspēja</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kartes Veiktspēja</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>4. CF Kartes Veiktspēja</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Sākt Testus!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klikšķiniet šeit, lai palaistu izvēlētos testus.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Izvēlaties modeli ar kuru salīdzināt rezultātus.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>kļūda</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Šis grafs rāda cik daudz atmiņas ir izlietots šajā Compact Flash atmiņas kartē.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>C</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz cietā diska.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz Secure Digital atmiņas kartes.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Ie</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Šis grafs rāda cik daudz atmiņas ir aizņemts uz šī handheld iebūvētās atmiņas (piem. Flash atmiņa).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Šis grafs norāda cik daudz atmiņas tiek patreiz lietots pagaidu RAM diskā.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Aplikācijas CPU lietojums (%)</translation>
+        <translation type="obsolete">Aplikācijas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Sistēmas CPU lietojums (%)</translation>
+        <translation type="obsolete">Sistēmas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Šī lapa rāda cik daudz tiek izmantots iekārtas procesors.</translation>
+        <translation type="obsolete">Šī lapa rāda cik daudz tiek izmantots iekārtas procesors.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Tips:</translation>
+        <translation type="obsolete">Tips:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Šī lapa rāda atmiņas (piem. RAM) izlietojumu šajā iekārtā.
 Atmiņas ir kategorizētas sekojoši:
 
 1. Izmantots - atmiņu izmanto Opie un jebkura strādājoša aplikācija.
 2. Buferi - pagaidu datu glabātuve kas tiek lietota lai uzlabotu veiktspēju.
 3. Kešots - informācija, kas nesen lietota un nav vēl atbrīvota.
 4. Brīvs - atmiņa kuru patreiz neizmanto Opie vai aplikācijas.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Kopā Atmiņa: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buferi (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Kešs (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Brīvs (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Kopā Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulis</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Lieto#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Izmanto</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Šis ir saraksts ar visiem šajā handheld iekārtā ielādētajiem kerneļa moduļiem.
 
 Klikšķiniet un pieturiet uz moduļa, lai redzētu papildus informāciju par moduli, vai arī to izlādētu.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Izvēlaties šeit komandu un klikšķiniet Nosūtīt pogu pa labi, lai aizsūtītu zemāk izvēlētam modulim komandu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klikšķiniet šeit, lai aizsūtītu iezīmēto komandu zemāk norādītam modulim.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Šis lauks rāda papildus informāciju par šo moduli.</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>
 Vai tiešām vēlaties palaist
 %1 šim modulim?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (1% kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Pieejams (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Komanda</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statuss</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Šis ir visu handheld iekārtas procesu saraksts.
 
 Klikšķiniet un turiet uz procesa, lai redzētu papildus informāciju par to, vai sūtītu tam signālu.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Izvēlaties signālu un klikšķiniet Sūtīt pogu pa labi, lai nosūtītu signālu šim procesam.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klikšķiniet šeit lai nosūtītu iezīmēto signālu šim procesam.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Šis lauks rāda pildu informāciju par šo procesu.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Tiešām nosūtīt %1
 šim procesam?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Sistēmas Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Atmiņa</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Glabātuve</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Process</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduļi</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versija</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Veiktspējas vērtējums</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernelis&lt;/b&gt;&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilējis:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Būvēts uz:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versija:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Modelis:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Ražotājs:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Šī lapa rāda Opie, Linux kerneļa un distribūcijas tekošās versijas.</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/today.ts b/i18n/lv/today.ts
index 4fb389e..89c8fee 100644
--- a/i18n/lv/today.ts
+++ b/i18n/lv/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation>Īpašnieks </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Lūdzu aizpildiet savu vizītkarti</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klišķiniet šeit lai palaistu saistīto aplikāciju</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nav aktviēti spraudņi</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Šodien</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Šodien Kļūda</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Spraudnis &quot;%1&quot; izsauca Šodien nojukšanu.  Varētu būt kad spraudnis nav pareizi instalēts.&lt;br&gt;Šodien turpinās ielādēt spraudņus.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Šodien</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Šodien - Maximilian Reiß</translation>
+        <translation type="obsolete">Šodien - Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klikšķiniet šeit lai iegūtu konfigurēšanas dialogu</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Šodien Konfigurācija</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Kādā kārtībā ielādēt kādus spraudņus:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Klikšķiniet uz izvēles rūtiņas lai aktivizētu/deaktivizētu spraudni vai arī lietojiet bultiņas lai mainītu attēlošanas kārtību</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Pārvietot uz Augšu</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Pārvietot uz Leju</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktīvs/kārtība</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Dažādi</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Forma1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Atķeksējiet šo ja vēlaties lai šodien tiktu parādīts pēc ieslēgšanas.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autorstartēt pēc atjaunošanas?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>sīkais baneris</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Būs mazs baneris</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cik minūtes PDA jābūt iemigušam pirms autostartēšanas iespēja iedarbojas pie atjaunošanas</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>neaktivitātes minūtes</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pikseļi</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Uzstādīt ikonas izmēru pikseļos</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>ikonas izmērs</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nekad</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Cik bieži Šodien vajag sevi atjaunot</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>atjaunot</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/zsafe.ts b/i18n/lv/zsafe.ts
index cf37a21..cdbe817 100644
--- a/i18n/lv/zsafe.ts
+++ b/i18n/lv/zsafe.ts
@@ -1,577 +1,625 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Lauks 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Lauks 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Lauks 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Lauks 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Lauks 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informācija:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Jauns Ieraksts</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Lauks 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Lietotāja vārds</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nosaukums</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSeifs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>FailuDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>failu tipu filtrs</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>ComboBox FailuTipuFiltra
 
 rediģē vai izvēlies filtru</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>apstiprina izvēli un aizver formu</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKPoga</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>atliek izvēli un aizver formu</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>AtliktPoga</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>rāda izvēlēto faila nosaukumu</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Faila nosaukums LineEdit
 
 rāda iezīmēto failu
 un atļauj tiešu faila nosaukuma
 labošanu</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Direktorija
 labo vai atzīmē direktorija vārdu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>size</source>
         <translation>izmērs</translation>
     </message>
     <message>
         <source>type</source>
         <translation>tips</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>direktoriju sarakstskats</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Direktorija SarakstaSkats
 
 rāda sarakstu ar direktorijiem un failiem</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>dir</translation>
     </message>
     <message>
         <source>file</source>
         <translation>fails</translation>
     </message>
     <message>
         <source>link</source>
         <translation>saite</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Lūdzu Uzgaidiet...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSeifs</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Jauns dokuments</translation>
+        <translation type="obsolete">&amp;Jauns dokuments</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Atvērt dokumentu</translation>
+        <translation type="obsolete">&amp;Atvērt dokumentu</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Saglabāt dokumentu kā ..</translation>
+        <translation type="obsolete">&amp;Saglabāt dokumentu kā ..</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Saglabāt dokumentu</translation>
+        <translation type="obsolete">&amp;Saglabāt dokumentu</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>S&amp;aglabāt dokumentu ar jaunu Paroli</translation>
+        <translation type="obsolete">S&amp;aglabāt dokumentu ar jaunu Paroli</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>&amp;Eksportēt teksta failu</translation>
+        <translation type="obsolete">&amp;Eksportēt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Importēt teksta failu</translation>
+        <translation type="obsolete">&amp;Importēt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>&amp;Izņemt teksta failu</translation>
+        <translation type="obsolete">&amp;Izņemt teksta failu</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Atvērt ierakstus izvērsti</translation>
+        <translation type="obsolete">&amp;Atvērt ierakstus izvērsti</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Iziet</translation>
+        <translation type="obsolete">&amp;Iziet</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Fails</translation>
+        <translation type="obsolete">&amp;Fails</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Jauns</translation>
+        <translation type="obsolete">&amp;Jauns</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Labot</translation>
+        <translation type="obsolete">&amp;Labot</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Dzēst</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Categorija</translation>
+        <translation type="obsolete">&amp;Categorija</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Izgriezt</translation>
+        <translation type="obsolete">&amp;Izgriezt</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopēt</translation>
+        <translation type="obsolete">&amp;Kopēt</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>I&amp;evietot</translation>
+        <translation type="obsolete">I&amp;evietot</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Meklēt</translation>
+        <translation type="obsolete">&amp;Meklēt</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Ieraksts</translation>
+        <translation type="obsolete">&amp;Ieraksts</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>Pa&amp;r</translation>
+        <translation type="obsolete">Pa&amp;r</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Palīdzība</translation>
+        <translation type="obsolete">&amp;Palīdzība</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Jauns ieraksts</translation>
+        <translation type="obsolete">Jauns ieraksts</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Labot ieraksta kategoriju</translation>
+        <translation type="obsolete">Labot ieraksta kategoriju</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Dzēst ieraksta kategoriju</translation>
+        <translation type="obsolete">Dzēst ieraksta kategoriju</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Meklēt ierakstu</translation>
+        <translation type="obsolete">Meklēt ierakstu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Lauks 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Lauks 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentārs</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Lauks 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Lauks 5</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Vai vēlaties dzēst?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>N&amp;edzēst</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Ieraksta nosaukmam jābūt atšķirīgam
 no kategorias nosaukuma.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Ieraksts nav atrasts</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Labi</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visi</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Teksts</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Izņemt teksta failu</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nevaru izņemt teksta failu.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Nav definēts dokuments.
 Jums jāizveido jauns dokuments</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Eksportēt teksta failu</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importēt teksta failu</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nevaru eksportēt uz teksta failu.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nevaru importēt teksta failu.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Ievadiet Paroli</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Kļūdaina parole.
 
 ZSeifs beidz darbu.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Kļūdaina parole.
 Ievadīsiet vēlreiz?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Jā</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nē.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Tukš dokuments vai
 kļūdaina parole.
 Turpināt?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nē</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Jā.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Parole ir tukša.
 Lūdzu ievadiet to vēlreiz.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Atkārtojiet Paroles Ievadu</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Parolēm jābūt identiskām.
 Lūdzu ievadiet vēlreiz.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Vai vēlaties saglabāt</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 pirms turpināšānas?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Saglabāt</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nesaglabāt</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Paroles fails saglabāts.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Vai vēlaties saglabāt
 pirms iziešanas?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>S&amp;aglabāt ar
 jaunu
 paroli</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Gaidīšanas Dialogs</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Savācu Ikonas...</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Tagad jūs variet ievadīt
 jūsu jaunizveidotā dokumenta 
 paroli divas reizes.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Atvērt ZSefa dokumentu</translation>
     </message>
     <message>
         <source>&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>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/bluepin.ts b/i18n/mk/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/mk/bluepin.ts
+++ b/i18n/mk/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/bluetooth-manager.ts b/i18n/mk/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/mk/bluetooth-manager.ts
+++ b/i18n/mk/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index ce18055..3d894d6 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -1,332 +1,332 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>М+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>
 =</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Калкулатор</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Стандарден</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Стандарден</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
index 570e6c1..66d8f35 100644
--- a/i18n/mk/checkbook.ts
+++ b/i18n/mk/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Нова сметка</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Информации</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Трансакции</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Графикони</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Заштита со лозинка</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Кликни овде за да се заштити со лозинка оваа сметка.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Овде внеси име на смтеката.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Избети тип на сметка овде.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Банка:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Внеси име на банката за оваа сметка. </translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Број на сметка:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Внеси го бројот на сметката овде.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN број:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Внеси PIN број за оваа сметка.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Почетна состојба:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Внеси ја почетната состојба на оваа сметка.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Внеси додатни информации за сметката.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ова е лита на сите трансакции внесени за оваа сметка.
 
 За да се подреди по полиња, кликни на името на колоната.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Број</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Сума</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Кликни овде за внесување на нова трансакција.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Одбери трансакција и потоа кликни овде за да се измени.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Избери сметка и потоа кликни овде зада се избрише.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Избери го саканиот графикон и потоа кликни на Нацртај копчето.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Кликни на саканиот тип на графикон.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Состојба на сметка</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Повлекувања на средства по категорија</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Депозити по категорија</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Нацртај</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Кликни овде за да се нацрта избраниот графикон.</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Потврдете лозинка</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Потврдете лозинка:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Внесете лозинка за да го потврдите бришењето на заштитата со лозинка:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Избриши трансакција</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Состојба</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Конфигурирај Сметка</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Внеси симбол за валута:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Внеси ги симболот на локалната валута овде.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Покажи дали сметката е заштитена 
 со лозинка</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Кликни овде за да се избере дали на главниот прозорец да се покажува дали сметката е заштитена или не со лозинка.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Покажи состојби на сметки</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Кликно овде за да се избере дали главниот прозорец ќе ги прикажува моменталните состојби за секоја сметка.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Кликни овде за да се креира нова сметка.
 
 Може исто така да изберете Ново од менито на Сметка.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Избери сметка и потоа кликни овде за да се уредува.
 
 Може исто да се одбере Уреди од менито Сметка, или да се кликне и да се задржи на името на сметката.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Избери сметка и потоа кликни овде за да се избрише.
 
 Исто така можете да изберете Избриши од менито Сметка.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Кликни овде за да конфигурира апликацијава.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Ова е листа на моментално достапните сметки.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Име на сметка</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Избриши сметка</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Нова</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Штедна</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Тековна</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">Кредитна</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Пазар на пари</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Заеднички фонд</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Останато</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Автомобил</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Сметки</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">ЦД-а</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Облека</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Компјутер</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD-а</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Забава</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Храна</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Гориво</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Општо</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Филмпви</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Кирија</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Патувања</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Работа</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Член на фамилија</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Општо Кредит</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Трансакција за</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Повлекување средства</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Овде се избира дали трансакцијата е повлекување на средства или депозит.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Депозит</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Датум:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Избери датум на трансакцијата.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Број:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Внеси број на чек.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Внеси опис на трансакцијата.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Избери категорија на трансакцијата.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Избери тип на трансакција.
 
 Опциите варираат во зависност од тоа дали трансакцијата е депозит или повлекување на средства.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Внеси сума на трансакцијата.
 
 Внесената вредност треба секогаш да е позитивна.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Внеси ја сумата на таксата поврзана со трансакцијата.
 
 Вредноста секогаш теба да биде позитивна.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Внеси додатни информации за трансакцијата.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Камата на долг</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Напишан чек</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Трансфер</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Кредитна Картичка</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Автоматско Плаќање</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Кеш</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index fb9225d..87efad5 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -151,679 +151,691 @@ Quit anyway?</source>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00р</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Испрати</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 РМ</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 АМ</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>РМ</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Особини</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Прегледи</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Основен преглед:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Листа на недели</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>1Месец</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Скокни на моментално време</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Стил на редови:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Основен</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Среден</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Приказ на време</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Подесувања за аларм</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Претпоставки за Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Почни преглед на настани</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Време на Почеток:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Јан-00. Јан</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Испрати</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>С: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>п</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Време на почеток</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Време на завршување</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Повторување...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Дневен...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Неделно...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Месечно...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Годишно...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Нов настан</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Локација</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Состанок</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Патување</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Јан 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Цел Ден</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Временска зона</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>минути</translation>
+        <translation type="obsolete">минути</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Тивок</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Гласно</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">денови</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Уреди забелешка</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ручек</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ст</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>нд</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>рд</translation>
     </message>
     <message>
         <source>th</source>
         <translation>тх</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Без Повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повторување по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>години</translation>
     </message>
     <message>
         <source>days</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>недела</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторувачки настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Фреквенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Крај на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Без краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Вар1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Вар 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Недела Вар</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>years</source>
         <translation>години</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
index 814b354..8a1a267 100644
--- a/i18n/mk/embeddedkonsole.ts
+++ b/i18n/mk/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Команди</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Команди&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Препорачани Команди&lt;?B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Листа на Команди</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Скриј листа на команди</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Зелено на Црно</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Црно на Бело</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Бело на Црно</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Зелено на Жолто</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Плаво на Црвено</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Црвено на Плаво</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Плаво на Бело</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Бело на Плава</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Плаво на Црно</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Црвено на Црно</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Сопствено</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Простор</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Јазиче</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Горе</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Залепи</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Лево</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Десно</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Лизгач</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Завиткај</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Користи звучен сигнал</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Скриј листа на команди</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Додади команда</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Внеси Команда за додавање:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/go.ts b/i18n/mk/go.ts
index 985ea5f..1a44c6c 100644
--- a/i18n/mk/go.ts
+++ b/i18n/mk/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Нова Игра</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Обид</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Повлечи се</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Оции за два играчи</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Бели %1, Црни %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Белиот победи.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Црниот победи.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Нерешено.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>1 обид</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Заробеници: црн %1, бел %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/gutenbrowser.ts b/i18n/mk/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/mk/gutenbrowser.ts
+++ b/i18n/mk/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 8c2c3e9..f70e180 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>неможе да се отвори датотека</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Полнење на двата уреда</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Полнење</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Состојба на батерија:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Добро</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Ниско</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>На помошно напојување</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Вклучено напојување</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Иклучено надворешно напојување</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
index cfc92de..59246fb 100644
--- a/i18n/mk/libliquid.ts
+++ b/i18n/mk/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Течен</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Течен</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libmemoryapplet.ts b/i18n/mk/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/mk/libmemoryapplet.ts
+++ b/i18n/mk/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiecore2.ts b/i18n/mk/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/mk/libopiecore2.ts
+++ b/i18n/mk/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopieobex.ts b/i18n/mk/libopieobex.ts
index 2c4827f..83ba39f 100644
--- a/i18n/mk/libopieobex.ts
+++ b/i18n/mk/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Примено:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Прифати</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Примивте датотека од тип %1 (&lt;img src=&quot;%2&quot;&gt;)Што сакате да направите?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Праќање:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Праќање:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Готово</translation>
+        <translation type="obsolete">Готово</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa не е вклучена!</translation>
+        <translation type="obsolete">IrDa не е вклучена!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Барање IrDa уреди.</translation>
+        <translation type="obsolete">Барање IrDa уреди.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth не е достапен</translation>
+        <translation type="obsolete">Bluetooth не е достапен</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Барање bluetooth уреди.</translation>
+        <translation type="obsolete">Барање bluetooth уреди.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Закажување на испраќање.</translation>
+        <translation type="obsolete">Закажување на испраќање.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Кликно да пренесеш</translation>
+        <translation type="obsolete">Кликно да пренесеш</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Пратено</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Пробај %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Повторно барај IrDa.</translation>
+        <translation type="obsolete">Повторно барај IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Почни праќање</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libscreenshotapplet.ts b/i18n/mk/libscreenshotapplet.ts
index 6c0e95b..b4b02f5 100644
--- a/i18n/mk/libscreenshotapplet.ts
+++ b/i18n/mk/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation>Доцнење</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>секунди</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Сними именувано</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Сними слика како...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Датотека</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Намали</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
-        <translation>Име на слика</translation>
+        <translation type="obsolete">Име на слика</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Успех</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Сликата е снимена на %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
index ef30237..7fdf806 100644
--- a/i18n/mk/libtodaydatebookplugin.ts
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[со аларм]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished">Прикажи локација</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished">Прилажи забелешки</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished">само денес</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished">Колку денови треба да бидат во опсегот</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished">Уште колку денови</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Додаток роковник</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Денеска нема повеќе сеостаноци </translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Денеска нема состаноци</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/odict.ts b/i18n/mk/odict.ts
index cbcb6b4..366f874 100644
--- a/i18n/mk/odict.ts
+++ b/i18n/mk/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Метод на пребарување</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Измени</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-речник</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Прашање:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ок</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Нема дефиниран речник</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Дефинирај еден</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Откажи</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Методи на пребарување</translation>
+        <translation type="obsolete">Методи на пребарување</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>О&amp;сетливо на големи и мали букви</translation>
+        <translation type="obsolete">О&amp;сетливо на големи и мали букви</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Параметри</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Датотека на речник</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Листај</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Јазик 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Деколатор</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Јазик 3</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Нов метод на пребарување</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Смени метод на пребарување</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/mk/opieirc.ts
+++ b/i18n/mk/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/mk/sysinfo.ts
index 118f753..135a857 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -1,357 +1,372 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Овој граф прикажува колку меморија се користи на оваа Flash картичка.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Овој граф прикажува колку простор има на дискот.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Овој граф покажува колку меморија се користи на оваа SD картичка.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Апликации на процесорот (%)</translation>
+        <translation type="obsolete">Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Користење на системскиот процесор (%)</translation>
+        <translation type="obsolete">Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
+        <translation type="obsolete">Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Тип:</translation>
+        <translation type="obsolete">Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Бафери ( %1 кВ)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кеширана (%1) кВ</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Слободна (%1 кВ)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Вкупно меморија: %1 кВ</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модул</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Искоритено#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ова е листа на сите вчитани модули на кернелот.
 
 Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Овој дел прикажува детални информации за модулот.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кВ</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Словофни (%1 кВ)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ова е листа на сите провеси.
 
 Килкни и задржи на процес за додатни информации, или да испратиш сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Избери сигнал и кликни на копчето Прати за да се испрати до процесот.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Кликни овде за зибраниот сигнал да се испрати до процесот.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Овде се прикажани деталн информации за процесот.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Информации за ситемот</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Меморија</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Медиум</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>Процесор</translation>
+        <translation type="obsolete">Процесор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процесс</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Верзија</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Компајлирано од:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Изградено на:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt; Верзија:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Оваа страна ја прикажува верзијата на Opie, кернелот и дистрибудиајта.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index e38f3b3..c0fdcd2 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Денес</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Сопственост на</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пополни ја визит картата</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Кликни овде за да се стартува асоцираната апликација</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Нема активни додатоци</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>денес од Maximillian ReiB</translation>
+        <translation type="obsolete">денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Вчитај додатоци по редослед:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>активирај/деактивирај додаток или користи ги стрелките за да се смени редоследод на прикажување</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Помести нагоре</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Помести надоле</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>активно/редослед</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">Избери ако „Денес“ треба автомтски да се стартува.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">минути неактивност</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">Намести големина на икони</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">никогаш</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">Колку често треба „Денес“ да се освежува</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/bluepin.ts b/i18n/nl/bluepin.ts
index 8f5e9cf..01c057d 100644
--- a/i18n/nl/bluepin.ts
+++ b/i18n/nl/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Voer PIN in a.u.b.</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Voer PIN in a.u.b:</translation>
+        <translation type="obsolete">Voer PIN in a.u.b:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Sla PIN op</translation>
+        <translation type="obsolete">Sla PIN op</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleer</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Uitgaande verbinding naar</translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Inkomende verbinding naar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/bluetooth-manager.ts b/i18n/nl/bluetooth-manager.ts
index 03c4e33..cd4ed40 100644
--- a/i18n/nl/bluetooth-manager.ts
+++ b/i18n/nl/bluetooth-manager.ts
@@ -1,340 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Bluetooth Manager</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Apparaatnaam:&lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>MAC adres:</translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Klasse</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Test</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Veranderingen zijn doorgevoerd.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>Herzoek naar diensten</translation>
+        <translation type="obsolete">Herzoek naar diensten</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>aan groep</translation>
+        <translation type="obsolete">aan groep</translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>verwijder</translation>
+        <translation type="obsolete">verwijder</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Test1:</translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>geen diensten gevonden</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Geen verbindingen gevonden</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Formulier 1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Apparaten</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Apparaatnaam</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Zoek naar apparaten</translation>
+        <translation type="obsolete">Zoek naar apparaten</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Verbindingen</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Verbindingstype</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Sinaal</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Instelling</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Bluetooth Basisinstelling</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Standaard PIN code</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>zet authentificatie aan</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>zet encryptie aan</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation>Zet Page-scan aan</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation>Zet Inquiry-scan aan</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Voer uit</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Rfcomm Koppelingstabel</translation>
+        <translation type="obsolete">Rfcomm Koppelingstabel</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Status Label</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Formulier 2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Apparaatnaam</translation>
+        <translation type="obsolete">Apparaatnaam</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Diensten</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>verander instellingen</translation>
+        <translation type="obsolete">verander instellingen</translation>
     </message>
     <message>
         <source>active</source>
         <translation>aktief</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>Dienstnaam</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Verander
+        <translation type="obsolete">Verander
 apparaatnaam</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>Standaard
+        <translation type="obsolete">Standaard
 PIN code</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>Tekstlabel9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>verbind</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>verbind+stel in</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>verbreek verbinding</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>stuur bestanden</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Welk bestand moet worden verstuurd?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Zoek naar apparaten</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Start zoeken</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Voeg apparaat toe</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Stop zoeken</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>ppp verbinding</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>Voer een ppp scripnaam in:</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Verbind</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>verbind</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>verbind+stel in</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>verbreek verbinding</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Rfcomm Koppelingen</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Koppel apparaat aan een verbinding</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Formulier 2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>Mac</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Kanaal</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/calculator.ts b/i18n/nl/calculator.ts
index b9210bc..2a675a2 100644
--- a/i18n/nl/calculator.ts
+++ b/i18n/nl/calculator.ts
@@ -1,331 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Rekenmachine</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Afstand</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Oppervlakte</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperaturen</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>are</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karaat</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cu cm</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg ton</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>naut. mijl</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>punten</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>sq cm</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>sq km</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>sq m</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>sq mm</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St ton</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>eetlepel</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>theelepels</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>ton</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/checkbook.ts b/i18n/nl/checkbook.ts
index 055cabc..cc54e5a 100644
--- a/i18n/nl/checkbook.ts
+++ b/i18n/nl/checkbook.ts
@@ -1,645 +1,653 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nieuw Kasboek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacties</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafieken</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beveilig</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik hier om beveiliging van dit kasboek aan/uit te schakelen.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geef hier naam van het kasboek in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Geeft hier het type kasboek in.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Voer hier de naam van de bank in.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Rekeningnummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Voer het bankrekeningnummer van dit kasboek in.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN Code:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Voer hier uw PINcode van dit kasboek in.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Voer hier het startsaldo voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Voer hier verdere info voor dit kasboek in.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Dit is een lijst van alle ingevoerde transacties van dit kasboek.
 
 Klik op de kolomnaam om te sorteren op een bepaald veld. </translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik hier om een nieuwe transactie in te voeren.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Selecteer een transactie, en klik hier om dze te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Selecteer een transactie, en klik hier om deze te verwijderen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Selecteer hieronder de gewenste grafiek, en druk op de Teken knop.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik hier om het grafiektype te kiezen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kasboeksaldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Opnames per kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Inleggingen per kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Teken</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik hier om de geselecteerde grafiek te tekenen.</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer hier a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bevestig hier a.u.b. uw wachtwoord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Voer hier uw wachtwoord in om verwijdering van wachtwoord te bevestigen:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Verwijder transactie</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sorteer op:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Selekteer sorteervolgorde voor kasboek.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Invoervolgorde</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Sorteerdatum</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigureer Kasboek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geef valutasymbool in:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geef hier uw gewenste valutasymbool in.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Laat zien of het kasboek beveiligd is</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven dat het kasboek wel of niet met een wachtwoord beveiligd is.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Laat kasboeksaldo&apos;s zien</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven wat van ieder kasboek het huidige saldo is.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>In&amp;stellingen</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Nieuw rekeningtype</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Rekeningtypes</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nieuwe kategorie</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Uitgaven</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Inkomsten</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorieen</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Debiteur</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nieuwe Debiteur</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Debiteuren</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Open laatste kasboek</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Klik hier om in te stellen of het laatst geopende kasboek bij het starten geopend moet worden.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Open &quot;laatste kasboek&quot; blad</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Klik hier om in te stellen of het laatst geopende blad in een kasboek getoond moet worden.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Sla nieuwe omschtijving op als debiteur</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Klik hier om de nieuwe omschrijving in de lijst van debiteuren op te slaan.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik hier om een nieuw kasboek te maken.
 
 U kunt ook Nieuw kiezen uit het Kasboek menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Selecteer een kasboek en klik hier om het te wijzigen.
 
 U kunt ook Wijzig uit het Kasboek menu kiezen, of de kasboeknaam ingedrukt houden.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Selecteer een kasboek en klik hier om het te verwijderen.
 
 U kunt ook Verwijder uit het Kasboek menu kiezen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dit is een lijst van alle nu aanwezige kasboeken.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kasboeknaam</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Kasboek</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Spaargeld</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>Belastingen</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Aandelen</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Anders</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Uitgaven</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Vaste lasten</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CD&apos;s</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleding</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD&apos;s</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Electronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Amusement</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Eten/Drinken</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Benzine</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Overig</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Films</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Huur</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reizen</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Inkomen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familie</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Diverse inkomsten</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transactie voor</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Opname</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Selecteer hier of de transactie een opname of een bijboeking is.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Bijboeking</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Selecteer hier de datum van de transactie.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Voer hier het kasboeknummer in.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Voer hier de omschrijving van de transactie in.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Voer hier de transactiekategorie in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Selecteer hier het transactietype.
 
 De opties die worden weergegeven zijn erop gebaseerd of dit een bijboeking of een opname is.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Voer hier het bedrag van de transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Onkosten:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Voer hier de onkosten van deze transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Voer hier extra informatie over de transactie in.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Rente op leningen</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Overboekingen</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Credit Card</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Autom. Betalingen</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contant</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index dd5758c..04276bc 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -152,680 +152,692 @@ Toch afsluiten?</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00 u</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Verzend deze gebeurtenis</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Aanzichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Standaard aanzicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Weeklijst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Spring naar huidig moment</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Rij stijl:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Tijdweergave</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Start-Eind</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Div</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarminstelling</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvoorinstelling</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start afspraken bekijken </translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Aanvangstijd:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinst.</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MDWDVZZM
 
 Weekdagen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Verstuur</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Eindtijd</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Herhaal...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagelijks...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wekelijks...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Maandelijks...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jaarlijks...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nieuwe afspraak</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Plaats</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Vergadering</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Lunch</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Diner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reis</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Eind</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tijdzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minuten</translation>
+        <translation type="obsolete">minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Luid</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Herhaal</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opmerking...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dagen</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Wijzig opmerking</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>De %1 %1 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>th</source>
         <translation>de</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation>om</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Herhalende afpraak</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Eindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/embeddedkonsole.ts b/i18n/nl/embeddedkonsole.ts
index 2613feb..d1fc18f 100644
--- a/i18n/nl/embeddedkonsole.ts
+++ b/i18n/nl/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Commandoselectie</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Commando&apos;s</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commando&apos;s&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Gesuggereedre Commando&apos;s&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Commandolijst</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Geef commandolijst weer</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Verberg commandolijst</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Groen op Zwart</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Zwart op Wit</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Wit op Zwart</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Groen op Geel</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blauw op Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta op Blauw</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyaan op Wit</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Wit op Cyaan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blauw op Zwart</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber op Zwart</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Aangepast</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Voer in</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spatie</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Plak</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Snelverandering</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Schuifbalk</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Breek af</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Gebruik piep</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Laat commandolijst zien</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Verberg commandolijst</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Commandoselectie</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Voeg commando toe</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vul toe te voegen commando in:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/go.ts b/i18n/nl/go.ts
index 5b410b3..5104803 100644
--- a/i18n/nl/go.ts
+++ b/i18n/nl/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nieuw spel</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pas</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Geef op</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Twee speler optie</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Wit %1, Zwart %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Wit wint.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Zwart wint.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Gelijkspel.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Ik pas</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Gevangen: zwart %1, wit %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/gutenbrowser.ts b/i18n/nl/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/nl/gutenbrowser.ts
+++ b/i18n/nl/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libaboutapplet.ts b/i18n/nl/libaboutapplet.ts
index 68f81a4..50c5e6a 100644
--- a/i18n/nl/libaboutapplet.ts
+++ b/i18n/nl/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Over.. snelkoppeling</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Over...</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished">Over...</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authors</source>
         <translation type="unfinished">Schrijvers</translation>
     </message>
     <message>
         <source>Report</source>
         <translation type="unfinished">Rapporteer</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Join</source>
         <translation type="unfinished">Meedoen</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libbatteryapplet.ts b/i18n/nl/libbatteryapplet.ts
index b09551d..5408616 100644
--- a/i18n/nl/libbatteryapplet.ts
+++ b/i18n/nl/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>kan bestand niet openen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Beide batterijen worden opgeladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Opladen</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batterijstatus:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Goed</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Erg laag</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritiek</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Reservestroom</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Stroom aangesloten</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Externe stroom niet aangesloten</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Geen externe batterij aangesloten</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>geen gegevens</translation>
     </message>
     <message>
         <source>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>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libliquid.ts b/i18n/nl/libliquid.ts
index 8e7c471..9c9294d 100644
--- a/i18n/nl/libliquid.ts
+++ b/i18n/nl/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Vloeibaar</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Vloeibaar</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libmemoryapplet.ts b/i18n/nl/libmemoryapplet.ts
index c30a59a..327b58a 100644
--- a/i18n/nl/libmemoryapplet.ts
+++ b/i18n/nl/libmemoryapplet.ts
@@ -1,166 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Processorgebruik van programma (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Processorgebruik van systeem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Deze pagina laat zien hoeveel de processor gebruikt wordt.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Deze pagina laat zien hoeveel geheugen (RAM) er in gebruik is op dit apparaat.
 Gegeugen wordt geklassificeerd als volgt:
 
 1. Gebruikt - gegeugen gebruikt door Opie en alle andere lopende programma&apos;s.
 2. Buffers - tijdelijke opslag die wordt gebruikt om de performance te verbeteren.
 3. Cached - informatie die recent gebruikt werd, maar nog in reserve gehouden wordt.
 4. Vrij - geheugen dat momenteel niet gebruikt wordt door Opie of andere lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Totaal Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Geheugenstatus</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Geheugen</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Swapfile</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Gebaseerd op broncode van:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Dit programma valt onder de GNU GPL licentie.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Over</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Plaats van swapfile</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kaart</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Aan</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Uit</translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation>Beheer swapfile</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Genereer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation>Fout bij ontkoppelen swapfile.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Swapfile uitgeschakeld.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Fout bij maken swapfile.</translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation>Fout bij aanmelden swapfile.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Swapfile aangemaakt.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Fout bij verwijderen swapfile.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Swapfile verwijderd.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Swapfile ingeschakeld.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopiecore2.ts b/i18n/nl/libopiecore2.ts
index 355afa7..24e3608 100644
--- a/i18n/nl/libopiecore2.ts
+++ b/i18n/nl/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Agenda toets</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Kontakten toets</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Menu toets</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Mail toets</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Thuis toets</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Opname toets</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Onder+Omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Onder+Omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Onder+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Onder+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hoger+Omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Hoger+Omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hoger+Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hoger+Links</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Aktie toets</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>OK toets</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Einde toets</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Afval</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopieobex.ts b/i18n/nl/libopieobex.ts
index 4819008..73287c2 100644
--- a/i18n/nl/libopieobex.ts
+++ b/i18n/nl/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepteer</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Klaar</translation>
+        <translation type="obsolete">Klaar</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa staat niet aan!</translation>
+        <translation type="obsolete">IrDa staat niet aan!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Zoek naar IrDa apparaten.</translation>
+        <translation type="obsolete">Zoek naar IrDa apparaten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth is niet beschikbaar</translation>
+        <translation type="obsolete">Bluetooth is niet beschikbaar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Zoek naar bluetooth apparaten.</translation>
+        <translation type="obsolete">Zoek naar bluetooth apparaten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Plan IrDa verzending.</translation>
+        <translation type="obsolete">Plan IrDa verzending.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klik voor IrDa verzending</translation>
+        <translation type="obsolete">Klik voor IrDa verzending</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Verzonden</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Poging %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Zoek nogmaals naar IrDa.</translation>
+        <translation type="obsolete">Zoek nogmaals naar IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Start verzending</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/libscreenshotapplet.ts b/i18n/nl/libscreenshotapplet.ts
index e1e067c..95f1fcc 100644
--- a/i18n/nl/libscreenshotapplet.ts
+++ b/i18n/nl/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation>Vertraging</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Sla screenshot op als...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Scap</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
-        <translation>Naam van Screenshot</translation>
+        <translation type="obsolete">Naam van Screenshot</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Gelukt</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Screenshot is weggeschreven naar %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/nl/libtodaydatebookplugin.ts
index a3c5a66..914cba5 100644
--- a/i18n/nl/libtodaydatebookplugin.ts
+++ b/i18n/nl/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[met alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>notitie</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatumboekPluginConfiguratieBasis</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Laat locatie zien</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Klik hier als iedere afspraak met plaats weergegeven moet worden</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Laat notitie zien</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Klik hier als iedere afspraak met notitie weergegeven moet worden</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Klik hier als alleen afspraken later dan de huidige tijd weergegeven moeten worden</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Laat tijd in extra regel zien</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Hoeveel afspraken moeten maximaal worden weergegeven. Chronologisch</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Hoeveel afspraken moeten worden weergegeven?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>alleen vandaag</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Hoeveel dagen moeten verder in de reeks zitten</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Hoeveel verdere dagen</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Agendaplugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Geen afspraken meer vandaag</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Geen afspraken vandaag</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/odict.ts b/i18n/nl/odict.ts
index e89c4da..99788d6 100644
--- a/i18n/nl/odict.ts
+++ b/i18n/nl/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Zoekmethode</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Verander</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Woordenboek</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Zoekopdr:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Zoekmethoden</translation>
+        <translation type="obsolete">Zoekmethoden</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Hoofdlettergevoelig</translation>
+        <translation type="obsolete">&amp;Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parameter</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Geen woordenboek gedefinieerd</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definieer</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleer</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Opie-Woordenboek</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Woordenboekbestand</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Blader</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Taal 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Decollator</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Taal 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nieuwe zoekmethode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Verander zoekmethode</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/opieirc.ts b/i18n/nl/opieirc.ts
index f476f2a..cedf9ca 100644
--- a/i18n/nl/opieirc.ts
+++ b/i18n/nl/opieirc.ts
@@ -1,721 +1,732 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Spreek op kanaal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Kanaaldiscussie</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Type hier je bericht om aan de discussie in het kanaal deel te nemen</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Verbonden, log nu in...</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Succcesvol ingelogd.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Socket error:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Niet bestaand kanaal openen - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persoon heeft kanaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>U heeft het knaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Vertrekken persoon niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Te verlaten kanaal niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Kanaalbericht van onbekende afzender</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Onbekende PRIVMSG ontvangen</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Onbekend persoon is gestopt - synchronisatie verloren?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>veranderde onderwerp in</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Onbekend kanaalonderwerp - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>CTCP PING ontvangen van</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION met slechte ontvanger</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Modus is van onbekend type</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Modusverandering met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Modusverandering met onbekende vlag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Modusverandering met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>User modes worden nog niet ondersteund</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>U werd ge-kick-t van</translation>
     </message>
     <message>
         <source> by </source>
         <translation>door</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>is ge-kick-t van</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Onbekend persoon is ge-kick-t - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Onbekende kick op kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serverbericht voor onbekend kanaal</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>U opent kanaal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Bijnaam is in gebruik, sluit opnieuw aan met een andere bijnaam</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Bijnaam niet bekend</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Ongebruikt nummeriek commando ontvangen: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Ongebruikt CTCP commando ontvangen: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Ongebruikt Tekstueel commando ontvangen: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 opent kanaal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>U verlaat kanaal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 verlaat kanaal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanaalbericht voor onbekend kanaal %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 is weggegaan (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Spreek met</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Privegesprek</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Type je tekst hier om een bericht aan de andere persoon te zenden</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Profielnaam:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>De naam van dit serverprofiel in het overzicht</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Hostnaam:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>De server om mee te verbinden - kan iedere geldige hostnaam of IP adres zijn</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Poort:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>De serverpoort om mee te verbinden. Gewoonlijk 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Je naam op het IRC netwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Echte naam:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Uw echte naam</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Wachtwoord om met de server te verbinden (indien nodig)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Kanalen:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Komma-gescheiden (CSV) lijst van kanalen die je je automatisch wilt aansluiten</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Wijzig serverinformatie</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Profielnaam vereist</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Hostnaam vereist</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Bijnaam vereist</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>De kanaallijst moet een komma
+        <translation type="obsolete">De kanaallijst moet een komma
 gescheiden lijst met kanaalnamen
 bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Serverlijst browser</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Kies een serverprofiel</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Selecteer een severprofiel uit de lijst en druk dan op OK in de hoek rechtsboven</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Verwijder het geselecteerde serverprofiel</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Verander het geselecteerde serverprofiel</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Voeg een nieuw serverprofiel in</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Serverberichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Typ commando&apos;s hier in. Een lijst met commando&apos;s kan worden gevonden in OpieIRC help</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">U staat nu bekend als %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Bijnaamverandering van een onbekend persoon</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 staat nu bekend als %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Weergegeven lijnen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Aantal lijnen die worden weergegeven voordat oude lijnen worden verwijderd - dit is nodig om geheugengebruik te beperken. Stel in op 0 als dit niet nodig is</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Achtergrondkleur:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>De te gebruiken achtergrondkleur in chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Normale tekstkleur:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>De te gebruiken tekstkleur in chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Foutkleur:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Tekstkleur om te gebruiken om fouten weer te geven</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Door jezelf geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Tekstkleur om je eigengeschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Door anderen geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Tekstkleur om door anderen geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Door de server geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Tekstkleur om door de server geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Berichtgevingen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Tekstkleur om te gebruiken om berichtgevingen weer te geven</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Missende omschrijving</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Beschrijving van de inhoud van deze tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Sluit deze tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Client</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Serververbindingen, kanalen, quieries en andere dingen worden hier geplaatst</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Maak een nieuwe verbinding met een IRC server</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Stel OpieIRC&apos;s gedrag en uiterlijk in</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
index b476485..6abceff 100644
--- a/i18n/nl/sysinfo.ts
+++ b/i18n/nl/sysinfo.ts
@@ -1,365 +1,380 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Dit vlak toont de beschikbare tests, de resultaten van de uitgevoerde tests, en vergelikingswaarden voor een geslecteerd apparaat. Gebruik de keuzevlakken om de gewenste tests uit te kiezen.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultaat</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Vergelijking</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Integer rekenen</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Breukrekenen</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Tekstrendering</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Beeldrendering</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Prestaties</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kaart Prestaties</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>6. CF Kaart Prestaties</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Start Tests!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klik hier om de geselecteerde tests uit te voeren.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Kies een model om de resultaten mee te vergelijken.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>fout</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Compact Flash kaart.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Harde schijf.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Secure Digital kaart.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte van het interne Flash geheugen van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op de tijdelijke RAM schijf van dit apparaat.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Programma GPU gebruik (%)</translation>
+        <translation type="obsolete">Programma GPU gebruik (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Systeem CPU gebruik (%)</translation>
+        <translation type="obsolete">Systeem CPU gebruik (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
+        <translation type="obsolete">Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Type:</translation>
+        <translation type="obsolete">Type:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw handheld.
 Gehugen wordt als volgt onderverdeeld:
 
 1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
 2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
 3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
 4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Tataal Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Gebruik#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dit is een lijst van alle kernelmodules die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of hem te beeindigen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selecteer hier een commando en klik op de Zend knop (rechts in beeld) om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik hier om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dit vlak geeft gedetailleerde informatie over deze module weer.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Gebruikt door</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Moet %1 echt
 gebruikt worden op deze module?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Beschikbaar (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dit is een lijst van alle processen die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of een signaal te sturen.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selecteer hier een signaal en klik op de Zend knop (rechts in beeld) om hetnaar dit proces te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik hier om het signaal naar dit proces te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dit vlak laat gedetailleerde info over dit proces zien.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Moet %1 echt naar
 dit proces gestuurd worden?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeeminfo</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Geheugen</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Opslag</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Benchmark</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Gecompileerd door:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gebouwd op:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versie:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Deze pagina geeft de huidige versies van Opie, de Linux kernel en de distributie van deze handheld weer.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Model:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Merk:</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
index 346f6d9..d6054df 100644
--- a/i18n/nl/today.ts
+++ b/i18n/nl/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Vandaag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Bezit van</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Visitekaartje invullen a.u.b.</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik hier om het bijbehorende programma te starten</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Geen plugins geactiveerd</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Vandaag door Maximilian Reiß</translation>
+        <translation type="obsolete">Vandaag door Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik hier voor het instellingsvenster</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Vandaag instelling</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Laad plugins in welke volgorde:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Vink een checkbox aan om een plugin te activeren/deactiveren of gebruik de pijltjes om de volgorde te veranderen</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Schuif omhoog</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Schuif omlaag</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktief/volgorde</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Div</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Formulier1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>vink dit aan als Vandaag moet starten vanuit slaapstand.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>start na slaapstand?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini banner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Gebruik kleine banner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Hoeveel minuten moet de PDA uitstaan voor Vandaag automatisch opkomt bij herstart</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minuten inactief</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixels</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Stel icoongrootte in pixels in</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>icoongrootte</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>secsec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nooit</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Hoevaak moet Vandaag zich verversen</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>ververs</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/zsafe.ts b/i18n/nl/zsafe.ts
index ecc8911..4374810 100644
--- a/i18n/nl/zsafe.ts
+++ b/i18n/nl/zsafe.ts
@@ -1,580 +1,628 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Icoon</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Veld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Veld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Veld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Veld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Veld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informatie:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nieuw Record</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Veld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Bestandsdialoog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Bestandstype Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Combibox Bestandtype Filter
 
 wijzig of selecteer het filter</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>bevestigt de selectie en sluit het formulier</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>Annuleert de huidige selectie en sluit het formulier</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>laat de geselecteerde bestandsnaam zien</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Wijzig Bestandsnaam
 
 Laat het geselecteerde
 bestand zien, en laat
 de bestandsnaam wijzigen</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Combibox Map
 
 wijzig of selecteer de mapnaam</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>size</source>
         <translation>grootte</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Bestandslijstweergave</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Lijstaanzicht mappen
 
 laat de lijst van mappen en bestanden zien</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>Map</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>link</source>
         <translation>koppeling</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Zoek</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>een moment aub...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Opslaan</translation>
+        <translation type="obsolete">&amp;Opslaan</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Opslaan met nieuw &amp;Wachtwoord</translation>
+        <translation type="obsolete">Opslaan met nieuw &amp;Wachtwoord</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>&amp;Exporteer tekstbestand</translation>
+        <translation type="obsolete">&amp;Exporteer tekstbestand</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Importeer tekstbestand</translation>
+        <translation type="obsolete">&amp;Importeer tekstbestand</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Verwijde&amp;r tekstbestand</translation>
+        <translation type="obsolete">Verwijde&amp;r tekstbestand</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Geexpandeerd openen</translation>
+        <translation type="obsolete">&amp;Geexpandeerd openen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Afsluiten</translation>
+        <translation type="obsolete">&amp;Afsluiten</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Bestand</translation>
+        <translation type="obsolete">&amp;Bestand</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nieuw</translation>
+        <translation type="obsolete">&amp;Nieuw</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Wijzigen</translation>
+        <translation type="obsolete">&amp;Wijzigen</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Verwijderen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Categorie</translation>
+        <translation type="obsolete">&amp;Categorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Knip</translation>
+        <translation type="obsolete">&amp;Knip</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieer</translation>
+        <translation type="obsolete">&amp;Kopieer</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Plak</translation>
+        <translation type="obsolete">&amp;Plak</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Zoek</translation>
+        <translation type="obsolete">&amp;Zoek</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Record</translation>
+        <translation type="obsolete">&amp;Record</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Over</translation>
+        <translation type="obsolete">&amp;Over</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Help</translation>
+        <translation type="obsolete">&amp;Help</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Veld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Veld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Veld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Echt verwijderen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Niet verwijderen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>De naam van de invoer moet
 zich van de categorienaam
 onderscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Zoek</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Gegeven niet gevonden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Kan tekstbestand niet verwijderen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Kan tekstbestand niet exporteren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Kan tekstbestand niet importeren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Wachtwoord invoeren</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Foutief wachtwoord.
 
 ZSafe zal nu afsluiten.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Foutief wachtwoord.
 
 Nogmaals invoeren?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Leeg bestand of
 foutief wachtwoord.
 Doorgaan?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Leeg wachtwoord.
 Nogmaals invoeren.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Wachtwoord nogmaals invoeren</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Wachtwoorden moeten identiek zijn.
 Nogmaals invoeren.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Wachtwoordbestand opgeslagen.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Wilt u de data opslaan
 voor het afsluiten?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Opslaan</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Met nieuw 
 &amp;Wachtwoord
 opslaan</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Niet opslaan</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>een moment aub...</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Zoek naar Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Nieuw document</translation>
+        <translation type="obsolete">&amp;Nieuw document</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Open document</translation>
+        <translation type="obsolete">&amp;Open document</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>Bestand &amp;opslaan als..</translation>
+        <translation type="obsolete">Bestand &amp;opslaan als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Open ZSafe Bestand</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Nieuwe Invoer</translation>
+        <translation type="obsolete">Nieuwe Invoer</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Wijzig categorie of record</translation>
+        <translation type="obsolete">Wijzig categorie of record</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Verwijder categorie of record</translation>
+        <translation type="obsolete">Verwijder categorie of record</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Vind Record</translation>
+        <translation type="obsolete">Vind Record</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Verwijder tekstbestand</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Geen document gekozen.
 Er moet een nieuw document aangemaakt worden</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Exporteer tekstbestand</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importeer tekstbestand</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Wilt u opslaan</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 voor u verdergaat?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>U moet tweemaal een wacht-
 woord invoeren voor
 uw nieuwe bestand.</translation>
     </message>
     <message>
         <source>&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>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/bluepin.ts b/i18n/no/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/no/bluepin.ts
+++ b/i18n/no/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/bluetooth-manager.ts b/i18n/no/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/no/bluetooth-manager.ts
+++ b/i18n/no/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/calculator.ts b/i18n/no/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/no/calculator.ts
+++ b/i18n/no/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index bba6730..8537267 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 2f315ae..691c019 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -140,684 +140,692 @@ Quit anyway?</source>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/embeddedkonsole.ts b/i18n/no/embeddedkonsole.ts
index 8658bbc..c64ebf8 100644
--- a/i18n/no/embeddedkonsole.ts
+++ b/i18n/no/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/go.ts b/i18n/no/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/no/go.ts
+++ b/i18n/no/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/gutenbrowser.ts b/i18n/no/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/no/gutenbrowser.ts
+++ b/i18n/no/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libaboutapplet.ts b/i18n/no/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/no/libaboutapplet.ts
+++ b/i18n/no/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libbatteryapplet.ts b/i18n/no/libbatteryapplet.ts
index 5b48263..52116ca 100644
--- a/i18n/no/libbatteryapplet.ts
+++ b/i18n/no/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libliquid.ts b/i18n/no/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/no/libliquid.ts
+++ b/i18n/no/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libmemoryapplet.ts b/i18n/no/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/no/libmemoryapplet.ts
+++ b/i18n/no/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libopiecore2.ts b/i18n/no/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/no/libopiecore2.ts
+++ b/i18n/no/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libopieobex.ts b/i18n/no/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/no/libopieobex.ts
+++ b/i18n/no/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libscreenshotapplet.ts b/i18n/no/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/no/libscreenshotapplet.ts
+++ b/i18n/no/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/no/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/no/libtodaydatebookplugin.ts
+++ b/i18n/no/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/odict.ts b/i18n/no/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/no/odict.ts
+++ b/i18n/no/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/opieirc.ts b/i18n/no/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/no/opieirc.ts
+++ b/i18n/no/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/no/sysinfo.ts
index f5e37e4..f462608 100644
--- a/i18n/no/sysinfo.ts
+++ b/i18n/no/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index 1c9203a..e297779 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/zsafe.ts b/i18n/no/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/no/zsafe.ts
+++ b/i18n/no/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/bluepin.ts b/i18n/pl/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/pl/bluepin.ts
+++ b/i18n/pl/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/bluetooth-manager.ts b/i18n/pl/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/pl/bluetooth-manager.ts
+++ b/i18n/pl/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/calculator.ts b/i18n/pl/calculator.ts
index c281e7d..4b2b8fb 100644
--- a/i18n/pl/calculator.ts
+++ b/i18n/pl/calculator.ts
@@ -1,331 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Kalkulator</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standardowy</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standardowy</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Waga</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Odległości</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Powierzchnia</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatury</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Objętości</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akry</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karaty</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm^3</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>st^3</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cal^3</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished">uncja fl (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>st</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hektary</translation>
     </message>
     <message>
         <source>in</source>
         <translation>cal</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>funt</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished">tony Lg</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mila</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>mila mor</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>uncja</translation>
     </message>
     <message>
         <source>points</source>
         <translation>punkty</translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished">pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished">qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm^2</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>st^2</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>cal^2</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km^2</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m^2</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mila^2</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm^2</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>jard^2</translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished">st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished">tony st</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>łyżka stołowa</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>łyżeczka</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jard</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 6ff7092..e55852f 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nowy rachunek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcje</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Wykresy</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Wpisz nazwę rachunku.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Wybierz typ rachunku.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Wpisz tu nazwę banku dla rachunku.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numer konta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Wpisz tu numer konta dla rachunku.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numer PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Wpisz tu numer PIN dla rachunku.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Bilans początkowy:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Wpisz tu początkowy bilans dla rachunku.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Wpisz tu dodatkowe informacje o tym rachunku.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>To jest lista wszystkich transakcji przeprowadzonych na tym rachunku.
 
 By przesortować wpisy wg pewnego pola, kliknij na nazwę kolumny.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Kwota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknij tu aby dodać nową transakcję.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Wybierz transakcję, a nastepnie kliknij tu by ją edytować.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunąć.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Wybierz pożądany wykres poniżej i kliknij na przycisk Rysuj.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknij tu aby wybrać typ wykresu.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Bilans konta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Wypłaty wg kateorii</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Wpłaty wg kategorii</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Rysuj</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknij tu aby rysować wybrany wykres.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Usuń transakcję</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Ochrona hasłem</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknij tu aby włączyć/wyłączyć ochronę tego rachunku hasłem.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Nr</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Wpisz hasło</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Proszę wpisać swoje hasło:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Proszę potwierdzić swoje hasło:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Proszę wpisać swoje hasło aby potwierdzić zniesienie ochrony hasłem:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Sortuj wg:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Wybierz tu sposób sortowania dla rachunku.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Kolejność wpisów</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Numer</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>ID</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilans</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfiguruj rachunek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Podaj symbol waluty:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Tu wpisz symbol swojej lokalnej waluty.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Pokaż czy rachunek jest chroniony
 hasłem</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Kliknij tu by zdecydować, czy okno główne ma pokazywać czy rachunek jest chroniony hasłem.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Pokaż bilanse rachunków</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknij tu by zdecydować, czy okno główne ma pokazywać aktualny bilans każdego rachunku.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Typ nowego konta</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Typy kont</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nowa kategoria</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Wydatki</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Wpływy</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Odbiorca</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Nowy odbiorca</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Odbiorcy</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Otwórz ostatni rachunek</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Kliknij tu by zdecydować czy ostatni otwarty rachunek ma być otwierany przy starcie.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Pokazuj ostatnią zakładkę rachunku</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Kliknij tu by zdecydować czy pokazywana ma być ostatnia zakładka rachunku.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Zapisz nowy opis jako odbiorcę</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Kliknij tu aby zapisać nowe opisy na liście odbiorców.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknij tu aby stworzyć nowy rachunek.
 
 Możesz również wybrać Nowy z menu Rachunek.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Wybierz rachunek i kliknij tu aby go edytować.
 
 Możesz również wybrać Edytuj z menu Rachunek albo kliknąć i przytrzymać nazwę rachunku.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunąć.
 
 Możesz również wybrać Usuń z menu Rachunek.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To jest lista wszystkich aktualnie dostępnych rachunków.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Usuń rachunek</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknij tu aby skonfigurować tą aplikcaję.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nazwa rachunku</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilans</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Podaj hasło</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Proszę podać swoje hasło:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Oszczędności</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Czeki</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Rynek finansowy</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fundusz wspólny</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Inne</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Wydatek</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Samochód</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rachunki</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>Płyty CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Ubrania</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Komputer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>Płyty DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Rozrywka</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Żywność</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Bezyna</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filmy</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Czynsz</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podróż</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Wpływ</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Praca</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Członek rodziny</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Różne Kredyt</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcja dla</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Wypłata</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Wybierz tu czy transakcja jest wypłatą czy wpłatą.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Wpłata</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Tu wybierz datę transakcji.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Wpisz tu numer czeku.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Tu wpisz opis transakcji.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Wybierz tu kategorię transakcji.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Tu wybierz typ transakcji.
 
 Dostepność opcji jest uzależniona od tego, czy transakcja jest wpłatą czy wypłatą.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Kwota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Wpisz tu kwotę transakcji.
 
 Wartość ta powinna być zawsze liczbą dodatnią.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Prowizja:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Wpisz wszelkie opłaty/prowizje związana z tą transakcją.
 
 Wpisana wartość powinna być liczbą dodatnią.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Wpisz tu wszelkie dodatkowe informacje o transakcji.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Karta płatnicza</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Czek</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Karta kredytowa</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Płatność automatyczna</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotówka</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 4142b6e..c34c98a 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -142,688 +142,700 @@ Wyjść?</translation>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emituj</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie całodobowe.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikuj</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emituj to wydarzenie</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Rozpocznij przegląd zdarzeń</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Czas poczatkowy:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ustawienia alarmu</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Ustawienie alarmu</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Styl wierszy:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Domyślne</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Średnie</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duże</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Widoki</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Domyślny widok:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzień</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Tydzień - lista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiąc</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skocz do &quot;dzisiaj&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Wyświetlanie czasu</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Początek - koniec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Domyślne</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie całodobowe.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Sty-00. Sty</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>PWŚCPSNP</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Edycja</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplikuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Usuń</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Emituj</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Powtarzaj...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dziennie...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tygodniowo...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Miesięcznie...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Rocznie...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Jednorazowe...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nowe zdarzenie</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Spotkanie</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Obiad</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Kolacja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podróż</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Sty 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cały dzień</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> minut</translation>
+        <translation type="obsolete"> minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Cichy</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glośny</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Powtarzaj</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nie powtarzaj</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Od - do</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notatki...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dni</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Obiad</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Początek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 co </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 co </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 co </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Co </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Jednorazowe</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tygodni</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Powtarzaj według</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dnia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Daty</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>miesiące</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>lata</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tygodnie</translation>
     </message>
     <message>
         <source>week</source>
         <translation>tydzień</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiąc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation> i </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 i </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, i </translation>
     </message>
     <message>
         <source>on </source>
         <translation>w </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Powtarzajace sie zdarzenie</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiac</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Czestotliwosc</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez konca</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Powtarzaj w</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>miesiące</translation>
     </message>
     <message>
         <source>years</source>
         <translation>lata</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index c6412bd..24525f6 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybór polecenia</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Polecenia</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Polecenia&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Sugerowane polecenia&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Wyświetl listę poleceń</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ukryj listę poleceń</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na białym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Białe na czarnym</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zielone na żółtym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magneta na niebieskim</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyjan na białym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Białe na cyjan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bursztyn na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadź</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dół</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Przewijanie</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Wyświetl listę poleceń</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ukryj listę poleceń</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Zdefiniuj</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista poleceń</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zawijaj</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Używaj sygnału</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybór polecenia</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj polecenie</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Wprowadź polecenie do dodania:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/go.ts b/i18n/pl/go.ts
index f45b56b..39511ba 100644
--- a/i18n/pl/go.ts
+++ b/i18n/pl/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pas</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Rezygnuj</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opcja dla 2 graczy</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Biale %1, Czarne %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Biale wygraly.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Czarne wygraly.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Remis.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Pasuje</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Wiezniowie: czarni %1, biali %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/gutenbrowser.ts b/i18n/pl/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/pl/gutenbrowser.ts
+++ b/i18n/pl/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libaboutapplet.ts b/i18n/pl/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/pl/libaboutapplet.ts
+++ b/i18n/pl/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index 0211115..d3af013 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Ładowanie</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Stan baterii:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dobry</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Krytyczny</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Na zasilaniu zapasowym</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Podłączony do zasilania</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Zewnętrzne zasilanie odłączone</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Porażka</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nie można otworzyć pliku</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Ładowanie obu urządzeń</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Wkład z baterią nie jest włożony</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>brak danych</translation>
     </message>
     <message>
         <source>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>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index 0a2fe89..471b37e 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmemoryapplet.ts b/i18n/pl/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/pl/libmemoryapplet.ts
+++ b/i18n/pl/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopiecore2.ts b/i18n/pl/libopiecore2.ts
index c713a0b..c8265c4 100644
--- a/i18n/pl/libopiecore2.ts
+++ b/i18n/pl/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Śmietnik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopieobex.ts b/i18n/pl/libopieobex.ts
index be1a48f..47150d8 100644
--- a/i18n/pl/libopieobex.ts
+++ b/i18n/pl/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Otrzymano:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Odmów</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Otrzymałeś plik typu %1 (&lt;img src=&quot;%2&quot;&gt; )Co chcesz zrobić?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Wysyłanie:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Wysyłanie:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Gotowe</translation>
+        <translation type="obsolete">Gotowe</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa nie jest włączona!</translation>
+        <translation type="obsolete">IrDa nie jest włączona!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Szukanie urządzeń IrDa.</translation>
+        <translation type="obsolete">Szukanie urządzeń IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth niedostępny</translation>
+        <translation type="obsolete">Bluetooth niedostępny</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Szukanie urządzeń bluetooth.</translation>
+        <translation type="obsolete">Szukanie urządzeń bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Wstawianie do emisji.</translation>
+        <translation type="obsolete">Wstawianie do emisji.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Kliknij by emitować</translation>
+        <translation type="obsolete">Kliknij by emitować</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Wysłane</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Porażka</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Próba %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Jeszcze raz szukaj IrDa.</translation>
+        <translation type="obsolete">Jeszcze raz szukaj IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Rozpocznij wysyłanie</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libscreenshotapplet.ts b/i18n/pl/libscreenshotapplet.ts
index ded2f36..b32ed89 100644
--- a/i18n/pl/libscreenshotapplet.ts
+++ b/i18n/pl/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/pl/libtodaydatebookplugin.ts
index bf41a9f..328bebf 100644
--- a/i18n/pl/libtodaydatebookplugin.ts
+++ b/i18n/pl/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[z alarmem]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>notatki</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cały dzień</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>Konfiguracja pluginu Kalendarza</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Pokazuj lokalizacje</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Zaznacz jeśli ma być pokazywana lokalizacja każdego spotkania</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Pokazuj notatki</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Zaznacz jeśli mają być pokazywane notatki dodane do spotkania</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Pokazuj jedynie nadchodzące spotkania</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Zaznacz jeśli mają być pokazywane jedynie spotkania późniejsze niż aktualny czas</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Pokazuj czas w dodatkowej linii</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Ile maksymalnie spotkań ma być pokazywane. W porządku chronologicznym</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Ile spotkań pokazywać?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>tylko dzisiaj</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Ile dni ma obejmować zasięg</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Ile jeszcze dni</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Plugin Kalendarz</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Nie ma więcej spotkań na dzisiaj</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Nie ma spotkań na dzisiaj</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/odict.ts b/i18n/pl/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/pl/odict.ts
+++ b/i18n/pl/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opieirc.ts b/i18n/pl/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/pl/opieirc.ts
+++ b/i18n/pl/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/pl/sysinfo.ts
index 7f80e9a..127f039 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -1,357 +1,372 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tym twardym dysku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci w pamieci wbudowanej tego urzadzenia (np. pamieci Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tymczasowym RAM-dysku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Uzycie procesora przez aplikacje (%)</translation>
+        <translation type="obsolete">Uzycie procesora przez aplikacje (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Uzycie procesora przez system (%)</translation>
+        <translation type="obsolete">Uzycie procesora przez system (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Typ:</translation>
+        <translation type="obsolete">Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
+        <translation type="obsolete">Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywana (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Bufory (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Podreczna (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Wolna (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Calkowita Pamiec: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uzyty#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>To jest lista wszystkich aktualnie zaladowanych modulow jadra.
 
 Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub wy go usunac z pamieci.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wybierz tu polecenie i kliknij przycisk Wyslij po prawej zeby wyslac polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Kliknij tu zeby wyslac wybrane polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Uzywany przez</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Zajete (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Wolne (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>polecenie</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>To jest lista wszystkich procesow dzialajacych na tym urzadzeniu.
 
 Kliknij i przytrzymaj na procesie by zobaczyc dodatkowe informacje o nim lub by wyslac do niego sygnal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wybierz tu sygnal i kliknij przycisk Wyslij po prawej by go wyslac do procesu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Kliknij tu by wyslac wybrany sygnal do tego procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym procesie.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacja o systemie</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Pamiec</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Dyski</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>Procesor</translation>
+        <translation type="obsolete">Procesor</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesy</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Jadro Linuksa&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilowane przez: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zbudowane na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Wersja:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Ta strona prezentuje aktualne wersje Opie, jadra Linuksa i dystrybucji dzialajacych na tym urzadzeniu.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index e61ca72..9a23a94 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Dzisiaj</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Wypełnij wizytowkę</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Brak aktywnych wtyczek</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Kliknij tu żeby uruchomić powiązana aplikacją</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Właściciel </translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Dzisiaj</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Dzisiaj - autor: Maximilian Reiß</translation>
+        <translation type="obsolete">Dzisiaj - autor: Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Kliknij tu ąeby wyświetlic okno konfiguracyjne</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Które wtyczki i w jakiej kolejności ładowac:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Do góry</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Do dołu</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktywne/kolejność</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>różne</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Zaznacz/odznacz pole by włączyć/wyłączyć wtyczkę lub używając przycisków ze strzałkami po prawej stronie zmień kolejność wyświetlania</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Konfiguracja Dzisiaj</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Zaznacz to jeśli program ma być automatycznie uruchamiany po wznowieniu.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autostart po wznowieniu?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>malutki baner</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Pokazuj mały baner</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minut nieaktywny</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixeli</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Ustaw rozmiar ikon w pikselach</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>rozmiar ikon</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nigdy</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Jak często program powinien odświeżać dane</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>odśwież</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/zsafe.ts b/i18n/pl/zsafe.ts
index 7cb20bc..7735bfa 100644
--- a/i18n/pl/zsafe.ts
+++ b/i18n/pl/zsafe.ts
@@ -1,566 +1,614 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informacje:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nowy wpis</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>PlikDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>filtr typu pliku</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Lista wyboru typu pliku
 
 edytuj lub wybierz filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>potwierdza wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>anuluje wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>pokazuje wybraną nazwę pliku</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Edycja nazwy pliku
 
 pokazuje wybrany plik
 i pozwala na edycję jego nazwy</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Lista wyboru katalogu
 edytuj lub wybierz nazwę katalogu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>size</source>
         <translation>rozmiar</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>lista katalogów</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Lista katalogów
 
 pokazuje listę katalogów i plików</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>katalog</translation>
     </message>
     <message>
         <source>file</source>
         <translation>plik</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Zapisz dokument</translation>
+        <translation type="obsolete">&amp;Zapisz dokument</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Zapisz dokument z &amp;hasłem</translation>
+        <translation type="obsolete">Zapisz dokument z &amp;hasłem</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>&amp;Eksportuj plik tekstowy</translation>
+        <translation type="obsolete">&amp;Eksportuj plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Importuj plik tekstowy</translation>
+        <translation type="obsolete">&amp;Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>&amp;Usuń plik tekstowy</translation>
+        <translation type="obsolete">&amp;Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Otwieraj wpisy rozwinięte</translation>
+        <translation type="obsolete">&amp;Otwieraj wpisy rozwinięte</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Koniec</translation>
+        <translation type="obsolete">&amp;Koniec</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Plik</translation>
+        <translation type="obsolete">&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Nowa</translation>
+        <translation type="obsolete">&amp;Nowa</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Edytuj</translation>
+        <translation type="obsolete">&amp;Edytuj</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategoria</translation>
+        <translation type="obsolete">&amp;Kategoria</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Wytnij</translation>
+        <translation type="obsolete">&amp;Wytnij</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopiuj</translation>
+        <translation type="obsolete">&amp;Kopiuj</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>W&amp;klej</translation>
+        <translation type="obsolete">W&amp;klej</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Szukaj</translation>
+        <translation type="obsolete">&amp;Szukaj</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Wpis</translation>
+        <translation type="obsolete">&amp;Wpis</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;O</translation>
+        <translation type="obsolete">&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>P&amp;omoc</translation>
+        <translation type="obsolete">P&amp;omoc</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Czy usunąć?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Nie usuwaj</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Nazwa wpisu musi być inna
 niż nazwa kategorii.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Nie znaleziono wpisu</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Nie można usunąć pliku tekstowego.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Nie można eksportować do pliku tekstowego.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Nie można importować z pliku tekstowego.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Podaj hasło</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Błędne hasło.
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Błędne hasło.
 Wpisz ponownie?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Nie.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Pusty dokument albo
 błędne hasło.
 Kontynuować?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Tak.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Hasło jest pusty.
 Podaj je ponownie.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Wpisz ponownie hasło</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Hasła muszą być identyczne.
 Wpisz jeszcze raz.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Plik z hasłami zapisany.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Czy chcesz zapisać dane
 przed wyjściem?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Zapisz</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>Zapisz z nowym &amp;hasłem</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Nie zapisuj</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Proszę czekać</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Zbieram ikony...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Nowy dokument</translation>
+        <translation type="obsolete">&amp;Nowy dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Otwórz dokument</translation>
+        <translation type="obsolete">&amp;Otwórz dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Zapisz dokument jako..</translation>
+        <translation type="obsolete">&amp;Zapisz dokument jako..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Otwórz dokument ZSafe</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Nowy wpis</translation>
+        <translation type="obsolete">Nowy wpis</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Edytuj kategorię lub wpis</translation>
+        <translation type="obsolete">Edytuj kategorię lub wpis</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Usuń kategorię lub wpis</translation>
+        <translation type="obsolete">Usuń kategorię lub wpis</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Znajdź wpis</translation>
+        <translation type="obsolete">Znajdź wpis</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Brak dokumentu.
 Musisz stworzyć nowy dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Eksportuj plik tekstowy</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Czy chcesz zapisać</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 teraz?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Teraz musisz dwukrotnie
 podać hasło dla nowego
 dokumentu.</translation>
     </message>
     <message>
         <source>&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>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/bluepin.ts b/i18n/pt/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/pt/bluepin.ts
+++ b/i18n/pt/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/bluetooth-manager.ts b/i18n/pt/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/pt/bluetooth-manager.ts
+++ b/i18n/pt/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/calculator.ts b/i18n/pt/calculator.ts
index c0bbc62..ccd4612 100644
--- a/i18n/pt/calculator.ts
+++ b/i18n/pt/calculator.ts
@@ -1,331 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Simples</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Simples</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distancia</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>ºC</translation>
+        <translation type="obsolete">ºC</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>caracs</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm cub</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>pés cub</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>pol cub</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>ºF</translation>
+        <translation type="obsolete">ºF</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>oz fl (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>polegadas</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>ton Lg</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mp</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>mil naut</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>pontos</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm quad</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>pés quad</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>polegadas quad</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km quad</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m quad</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>mil quad</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm quad</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>jardas quad</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>Ton st</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>toneladas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>jardas</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index f13f566..47a6fd8 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova despesa</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transações</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduza o nome da despesa aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Escolha o tipo de despesa aqui.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduza o nome do banco para esta despesa.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número de Conta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduza o número de conta para esta despesa.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduza o PIN para esta despesa.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo Inicial:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduza o saldo inicial para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduza informação adicional para esta lista de despesas.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Aqui poderá ver a lista de todas as transações introduzidas para esta lista de despesas.
 
 Para ordenar por um campo específico, clique no nome da coluna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Clique aqui para adicionar uma transação.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione uma transação e clique aqui para a editar.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione uma transação e clique aqui para a apagar.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione o gráfico pretendido e clique no botão &quot;Gráfico&quot;.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Clique aqui para escolher o gráfico desejado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo da Conta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Levantamentos por categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Gráfico</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Clique aqui para desenhar o gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Apagar transação</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger por palavra chave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Clique aqui para activar/desactivar a protecção por palavra chave.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme palavra chave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Confirme a sua palavra chave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Introduza a sua palavra chave para desactivar a protecção:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Saldo</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Despesas</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduza o símbolo monetário:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduza o símbolo monetário aqui.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra se as despesas estão protegidas 
 por palavra chave ou não</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Clique aqui para selecionar se a janela principal irá mostrar se as despesas estão protegidas por palavra chave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar saldos das despesas</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Clique aqui para selecionar se a janela principal irá mostrar o saldo actual de cada lista de despesas.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Clique aqui para criar uma nova lista de despesas.
 
 Também pode escolher &quot;Novo&quot; no menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione uma lista de despesas e clique aqui para a editar.
 
 Também pode escolher &quot;Edit&quot; no menu, ou clicar e esperar num nome.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Clique aqui para apagar uma nova lista de despesas.
 
 Também pode escolher &quot;Apagar&quot; no menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Está é a lista de todas as listas de despesas disponíveis.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Apagar lista de despesas</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Clique aqui para a configuração.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome da Despesa</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Novo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Poupanças</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Cheques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Mercado Monetário</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Fundos Mútuos</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Outro</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automóvel</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Contas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Roupa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Informática</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDs</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished">Electrónico</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Entretenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Combustível</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Vários</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Filmes</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Rendas</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viagens</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Vencimento</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Despesas Familiares</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Créditos Diversos</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transação para</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Levantamento</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione se a transação é um levantamento ou um depósito aqui.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione a data da transação aqui.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduza o número do cheque aqui.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduza a descrição da transação aqui.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione a categoria da transação aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione o tipo de transação aqui.
 
 As opções são dependentes da transação ser de levantamento ou de depósito.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Valor:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduza o valor da transação aqui.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduza a taxa associada à transação.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduza informação adicional para esta transação aqui.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Taxa de Débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferência</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Cartão de Crédito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pagamento Automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Dinheiro</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index 34332f4..2386038 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -150,680 +150,692 @@ Sair na mesma?</translation>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicado</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Irradiar esta ocorrência</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Início da vista de eventos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora de Início:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarme Pré-definido</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo da Linha:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Largo</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista por omissão:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Semanas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Ir para o dia actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostrar o dia</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Morada:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">STQQSSDS</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicado</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Irradiar</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Hora Início</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora Fim</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Morada</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Hora Início</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo o dia</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso horário</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minutos</translation>
+        <translation type="obsolete">minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencioso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dias</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos os %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation>em</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fim Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data de Fim</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>SemanaVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index f46f484..9246e3c 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção do Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos&lt;/b&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta em Azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Âmbar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista de Comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Quebra</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usar Som</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/go.ts b/i18n/pt/go.ts
index 46e6f0a..7bf4c5e 100644
--- a/i18n/pt/go.ts
+++ b/i18n/pt/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passar</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Desistir</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Opções de dois jogadores</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Branco %1, Preto %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Branco ganhou.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Preto ganhou.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Uma linha.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Eu passo</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisioneiros: preto %1, branco %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/gutenbrowser.ts b/i18n/pt/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/pt/gutenbrowser.ts
+++ b/i18n/pt/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libaboutapplet.ts b/i18n/pt/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/pt/libaboutapplet.ts
+++ b/i18n/pt/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index bc6b816..006c4d4 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>A carregar</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado da bateria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Em energia de reserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Energia externa</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Energia externa desligada</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>erro ao ler os dados</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>A carregar as duas baterias</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Adaptador externo sem bateria</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>sem dados</translation>
     </message>
     <message>
         <source>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>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 75e38d7..6718600 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Líquido</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libmemoryapplet.ts b/i18n/pt/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/pt/libmemoryapplet.ts
+++ b/i18n/pt/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopiecore2.ts b/i18n/pt/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/pt/libopiecore2.ts
+++ b/i18n/pt/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopieobex.ts b/i18n/pt/libopieobex.ts
index f7c574c..f350e48 100644
--- a/i18n/pt/libopieobex.ts
+++ b/i18n/pt/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recebido:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Recebeu um ficheiro do tipo %1 (&lt;img src=&quot;%2&quot;&gt;). O que quer fazer com ele?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;A Enviar:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;A Enviar:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Enviado</translation>
+        <translation type="obsolete">Enviado</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>Infravermelhos desactivados!</translation>
+        <translation type="obsolete">Infravermelhos desactivados!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>A procurar dispositivos com infravermelhos.</translation>
+        <translation type="obsolete">A procurar dispositivos com infravermelhos.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>O bluetooth não está disponível</translation>
+        <translation type="obsolete">O bluetooth não está disponível</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>A procurar por dispositivos com Bluetooth.</translation>
+        <translation type="obsolete">A procurar por dispositivos com Bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Marcado para envio.</translation>
+        <translation type="obsolete">Marcado para envio.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Clique para irradiar</translation>
+        <translation type="obsolete">Clique para irradiar</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviado</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falhou</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Tentativa %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Procurar outra vez por dispositivos com infravermelhos.</translation>
+        <translation type="obsolete">Procurar outra vez por dispositivos com infravermelhos.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Iniciar o envio</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libscreenshotapplet.ts b/i18n/pt/libscreenshotapplet.ts
index 4d6d749..3d2c5f6 100644
--- a/i18n/pt/libscreenshotapplet.ts
+++ b/i18n/pt/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Nome da captura do ecrâ</translation>
+        <translation type="obsolete">Nome da captura do ecrâ</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Espera</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Nome a gravar</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Gravar captura como...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Scap</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>A captura foi enviada para %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/pt/libtodaydatebookplugin.ts
index 05b6ed9..a135538 100644
--- a/i18n/pt/libtodaydatebookplugin.ts
+++ b/i18n/pt/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[com alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Dia todo</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostrar localização</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Active isto se quiser ver a localização de cada marcação</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Active isto se quiser ver a nota associada a cada marcação</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Mostrar próximas marcações</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Active isto se quiser ver apenas as próximas marcações</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Mostrar tempo numa linha extra</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Qual o máximo de marcações a mostrar em ordem temporal</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Quantas marcações serão mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>apenas hoje</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Quantos dias mais deverão estar disponíveis</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Quantos dias mais</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Extra de Marcações</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Sem mais marcações para hoje</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Sem marcações para hoje</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/odict.ts b/i18n/pt/odict.ts
index 50da67c..d3c8fe3 100644
--- a/i18n/pt/odict.ts
+++ b/i18n/pt/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Método de Procura</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Mudar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>Dicionário Opie</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Procura:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Métodos de Procura</translation>
+        <translation type="obsolete">Métodos de Procura</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Sensível a letra grande/pequena</translation>
+        <translation type="obsolete">&amp;Sensível a letra grande/pequena</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Parâmetros</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Nenhum dicionário definido</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Definir um</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Dicionário Opie</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Ficheiro de Dicionário</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Idioma 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Decolador</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Idioma 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Novo método de procura</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Mudar método de procura</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieirc.ts b/i18n/pt/opieirc.ts
index f210d43..91d09ad 100644
--- a/i18n/pt/opieirc.ts
+++ b/i18n/pt/opieirc.ts
@@ -1,721 +1,732 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>A falar no canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Canal de discussão</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escreva aqui as suas mensagens para participar na discussão deste canal</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Ligado, a autenticar..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Autenticado.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Erro na ligação:</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Ligação terminada</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Entrou num canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Esta pessoa já tinha entrado no canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Já tinha entrado neste canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>A pessoa que saiu não foi encontrada - de-sincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Saiu de um canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensagem no canal sem originador conhecido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Mensagem privada de tipo desconhecido</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Saiu um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>tópico alterado para</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Tópico de canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recebido um CTCP PING de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>Acção CTCP de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>Acção CTCP de um canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>Acção CTCP com destinatário inválido</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Mudança de modo de tipo desconhecido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Mudança de modo de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Mudança de modo de &quot;flag&quot; desconhecida</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Mudança de modo com &quot;kannel&quot; desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de utilizador ainda não suportados</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Foi expulsado de</translation>
     </message>
     <message>
         <source> by </source>
         <translation>por</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>foi expulsado de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsão de um utilizador desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsão de um canal desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensagem do servidor de um canal desconhecido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Entrou no canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>A alcunha já está a ser usada. Escolha uma alcunha diferente e volte a ligar-se</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Alcunha desconhecida</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Recebido um comando numérico desconhecido: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Recebido um comando CTCP desconhecido: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Recebido um comando literal desconhecido: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 entrou no canal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Saíu do canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 saíu do canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Mensagem de canal de um canal desconhecido %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 saíu (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>A falar em</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Conversa privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escreva aqui o texto a ser enviado ao outro utilizador</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nome do perfil:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>O nome do perfil do servidor a mostrar no resumo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Servidor:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>O servidor a ligar - pode ser um nome ou um endereço IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Porta:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>A porta do servidor a ligar. Geralmente a 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>A sua alcunha na rede do IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>O seu nome real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>A password para ligar ao servidor (se necessário)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canais:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de canais a entrar automaticamente, separados por vírgulas</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar informação do servidor</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>É necessário um nome para o perfil</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>É necessário um servidor</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>É necessário uma alcunha</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>A lista de canais deverá conter nomes
+        <translation type="obsolete">A lista de canais deverá conter nomes
 de canais separados por vírgulas. Os 
 nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Escolha um perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Escolha um perfil de servidor desta lista e depois escolha Ok</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Apagar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Adicionar um perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Mensagens do servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escreva comandos aqui. A lista de comandos está disponível na ajuda do OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">A sua alcunha mudou para %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">Alteração de alcunha de um utilizador desconhecido</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">%1 mudou a alcunha para %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Linhas mostradas:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Quantidade de linhas a mostrar nas conversas antes que as linhas antigas sejam apagadas - isto é necessário para reduzir o consumo de memória. Escolha 0 se não necessitar esta funcionalidade</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Cor do fundo:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Cor de fundo a usar nas conversas</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Cor do texto:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Cor do texto a usar nas conversas</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Cor dos erros:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Cor do texto a usar para erros</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto escrito por si:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito por si</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto escrito por outros:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito por outros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito pelo servidor:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Cor do texto escrito a usar para identificar o texto escrito pelo servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificações:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Cor do texto a usar para notificações</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descrição em falta</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descrição do conteúdo da pasta</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Fechar esta pasta</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Cliente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Ligações ao servidor, canais, perguntas e outras coisas estarão aqui</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nova ligação</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Criar uma nova ligação a um servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar o comportamento e aparência do OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 0c84bfd..0a8bc71 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -1,357 +1,372 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Este gráfico representa o espaço ocupado neste cartão de memória Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa o espaço ocupado neste disco.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa o espaço ocupado neste cartão de memória Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa o espaço ocupado na memória interna (p.ex. Flash Memory) neste dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa o espaço ocupado na memória RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>CPU - Aplicações (%)</translation>
+        <translation type="obsolete">CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>CPU - Systema (%)</translation>
+        <translation type="obsolete">CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Tipo:</translation>
+        <translation type="obsolete">Tipo:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Este gráfico representa a ocupação do processador.</translation>
+        <translation type="obsolete">Este gráfico representa a ocupação do processador.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta é a lista de todos os módulos do kernel actualmente em utilização neste dispositivo.
 
 Clique e espere num módulo para ver informação adicional, ou para o remover da memória.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione um comando aqui e depois clique no botão &quot;Enviar&quot; para enviar o comando ao módulo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Clique aqui para enviar o comando seleccionado ao módulo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta àrea mostra a informação detalhada deste módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta é a lista de todos os processos deste dispositivo.
 
 Clique e espere num processo para ver informação adicional, ou para lhe enviar um sinal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione um sinal aqui e depois clique no botão &quot;Enviar&quot; para enviar o sinal ao processo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Clique aqui para enviar o sinal seleccionado ao processo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta àrea mostra a informação detalhada deste processo.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info. Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel de Linux&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilado em:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página mostra a versão do Opie, do kernel do Linux e da distribuição a correr neste dispositivo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index a78b877..e935858 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Não existe nenhum extra activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Clique aqui para lançar a aplicação associada</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Hoje, por Maximilian Reiß</translation>
+        <translation type="obsolete">Hoje, por Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clique aqui para a janela de configuração</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Quais os extras a carregar e qual a ordem:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover para Cima</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover para Baixo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activar/ordenar</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Active ou desactive cada extra ou use os cursores para alterar a ordem</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuração do &quot;Hoje&quot;</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Active aqui se quiser que o &quot;hoje&quot; seja iniciado ao ligar o dispositivo.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>iniciar ao ligar?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>barra pequena</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Com barra pequena</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Qual o intervalo de inactividade, em minutos, para que o&quot;hoje&quot; seja iniciado ao ligar</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>píxel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Altere o tamanho do icone, em pixeis</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamanho do icone</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Qual o intervalo de actualização</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/zsafe.ts b/i18n/pt/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/pt/zsafe.ts
+++ b/i18n/pt/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/bluepin.ts b/i18n/pt_BR/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/pt_BR/bluepin.ts
+++ b/i18n/pt_BR/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/bluetooth-manager.ts b/i18n/pt_BR/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/pt_BR/bluetooth-manager.ts
+++ b/i18n/pt_BR/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/calculator.ts b/i18n/pt_BR/calculator.ts
index e0c02fc..4fc3204 100644
--- a/i18n/pt_BR/calculator.ts
+++ b/i18n/pt_BR/calculator.ts
@@ -1,332 +1,340 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Padrão</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distância</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>quilates</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>cm³</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>cu ft</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>cu in</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>fl oz (US)</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <source>g</source>
         <translation>g</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>gal (US)</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>hectares</translation>
     </message>
     <message>
         <source>in</source>
         <translation>pol</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>lb</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation>Lg tons</translation>
     </message>
     <message>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>mg</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>naut. mi</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>oz</translation>
     </message>
     <message>
         <source>points</source>
         <translation>pontos</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>pt</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>qt</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>cm²</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>sq ft</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>sq in</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>km²</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>m²</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>sq mi</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>mm²</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>sq yd</translation>
     </message>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>St tons</source>
         <translation>St tons</translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>tblspoon</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>teaspoons</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>toneladas</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>yd</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index 4bf1fcb..53b29b9 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 02438de..7ced8b4 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -111,720 +111,732 @@ longa que o intervalo entre repetições.</translation>
         <source>M</source>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Silencioso</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Este evento ocupa todo o dia.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Enviar esta ocorrência</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
         <translation>Al. Padrão</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Horário de inicial dos eventos</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora Inicio:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo de coluna:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista padrão:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista Semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Ir para a hora corrente</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostrar horário</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Padrões</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escitório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Residência</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Este evento ocupa todo o dia.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>MTWTFSSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>No Repeat...</source>
         <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Horário Inicial</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Horário Final</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>Home</source>
         <translation>Resid</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Não Repete...</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation> minutos</translation>
+        <translation type="obsolete"> minutos</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenc</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona Horária</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Hora Inicial</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dias</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 todo(a) </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todo(a) </translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>O(A) %1 a cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>O(A) %1 %1 a cada</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>nd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>st</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>th</source>
         <translation>o(a)</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>on </source>
         <translation>em</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Termina Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index e8062f9..785fc96 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -1,250 +1,254 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Up</source>
         <translation>Acima</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Aba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entra</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
         <translation>Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/go.ts b/i18n/pt_BR/go.ts
index 9d4eddf..a4fde7b 100644
--- a/i18n/pt_BR/go.ts
+++ b/i18n/pt_BR/go.ts
@@ -1,53 +1,57 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Passar</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Dois Jogadores</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Desistir</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>A draw.</source>
         <translation>Um empate</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Eu passo</translation>
     </message>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Preto %1, Branco %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Branco vence.</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Pridioneiros: preto %1, branco %2</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Preto Vence</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/gutenbrowser.ts b/i18n/pt_BR/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/pt_BR/gutenbrowser.ts
+++ b/i18n/pt_BR/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libaboutapplet.ts b/i18n/pt_BR/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/pt_BR/libaboutapplet.ts
+++ b/i18n/pt_BR/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libbatteryapplet.ts b/i18n/pt_BR/libbatteryapplet.ts
index cb02e9b..bcb9997 100644
--- a/i18n/pt_BR/libbatteryapplet.ts
+++ b/i18n/pt_BR/libbatteryapplet.ts
@@ -1,87 +1,88 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado da Bateria</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Energia externa desconectada</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Energia ligada</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Usando energia de reserva</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Carregando</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>não pude abrir arquivo</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Carregando ambos dispositivos</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Nenhuma jaqueta com bateria inserida</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>sem dados</translation>
     </message>
     <message>
         <source>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>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libliquid.ts b/i18n/pt_BR/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/pt_BR/libliquid.ts
+++ b/i18n/pt_BR/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libmemoryapplet.ts b/i18n/pt_BR/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/pt_BR/libmemoryapplet.ts
+++ b/i18n/pt_BR/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopiecore2.ts b/i18n/pt_BR/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/pt_BR/libopiecore2.ts
+++ b/i18n/pt_BR/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopieobex.ts b/i18n/pt_BR/libopieobex.ts
index 4adcc61..de4a66d 100644
--- a/i18n/pt_BR/libopieobex.ts
+++ b/i18n/pt_BR/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recebido:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Negar</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Você recebeu um arquivo do tipo %1 (&lt;img src=&quot;%2&quot;&gt; )O que você quer fazer?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Feito</translation>
+        <translation type="obsolete">Feito</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa não está habilitado!</translation>
+        <translation type="obsolete">IrDa não está habilitado!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Procurando dispositivos IrDa.</translation>
+        <translation type="obsolete">Procurando dispositivos IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth não está disponível</translation>
+        <translation type="obsolete">Bluetooth não está disponível</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Procurando dispositivos Bluetooth.</translation>
+        <translation type="obsolete">Procurando dispositivos Bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Agendando transmissão.</translation>
+        <translation type="obsolete">Agendando transmissão.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Clique para transmitir</translation>
+        <translation type="obsolete">Clique para transmitir</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviado</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Tentativa %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Buscar novamente por IrDa.</translation>
+        <translation type="obsolete">Buscar novamente por IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Inicie envio</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libscreenshotapplet.ts b/i18n/pt_BR/libscreenshotapplet.ts
index 6e0d2e6..33dd7b8 100644
--- a/i18n/pt_BR/libscreenshotapplet.ts
+++ b/i18n/pt_BR/libscreenshotapplet.ts
@@ -1,58 +1,54 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/pt_BR/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/pt_BR/libtodaydatebookplugin.ts
+++ b/i18n/pt_BR/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/odict.ts b/i18n/pt_BR/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/pt_BR/odict.ts
+++ b/i18n/pt_BR/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opieirc.ts b/i18n/pt_BR/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/pt_BR/opieirc.ts
+++ b/i18n/pt_BR/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/pt_BR/sysinfo.ts
index 494101e..b0210f7 100644
--- a/i18n/pt_BR/sysinfo.ts
+++ b/i18n/pt_BR/sysinfo.ts
@@ -1,354 +1,365 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Type: </source>
-        <translation>Tipo: </translation>
+        <translation type="obsolete">Tipo: </translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Uso de CPU pelo sistema (%)</translation>
+        <translation type="obsolete">Uso de CPU pelo sistema (%)</translation>
     </message>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Uso de CPU por aplicações (%)</translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Uso de CPU por aplicações (%)</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memória Total: %1 kB</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Em cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>CPU</source>
-        <translation>CPU</translation>
+        <translation type="obsolete">CPU</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processo</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>System Info</source>
         <translation>Informações do Sistema</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gerado em: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel do Linux&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index f6aa077..c393e0a 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,143 +1,147 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor preencha seu cartão de visita</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nenhum plugin ativado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Clique aqui para lançar a aplicação associada</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertence a</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Hoje por Maximilian Reiss</translation>
+        <translation type="obsolete">Hoje por Maximilian Reiss</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clique aqui para abrir o diálogo de configuração</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Caregar os plugins em que ordem:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Sobe</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Desce</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>ativos/ordem</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Marque uma caixa de verificação para ativar/desativar um plugin ou use os botões com as flexas na direita para mudar a ordem de apresentação</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Hoje Configuração</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Marque aqui para iniciar o Hoje ao ativar o dispositivo.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>autoiniciar ao ativar ?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>faixa pequena</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Usar uma faixa pequena</translation>
     </message>
     <message>
         <source> min</source>
         <translation> min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Quantos minutos seu PDA tem que permacer suspenso antes que o autoinício seja lançado ao ativar</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inativos</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation> pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Tamanho do ícone em pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamanho do icone</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Freqüencia com que o Hoje deve se atualizar</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>atualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/zsafe.ts b/i18n/pt_BR/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/pt_BR/zsafe.ts
+++ b/i18n/pt_BR/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/bluepin.ts b/i18n/ru/bluepin.ts
index 5a81d83..4cf85fd 100644
--- a/i18n/ru/bluepin.ts
+++ b/i18n/ru/bluepin.ts
@@ -1,36 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation>Введите PIN</translation>
     </message>
     <message>
         <source>Please enter PIN:</source>
-        <translation>Введите PIN:</translation>
+        <translation type="obsolete">Введите PIN:</translation>
     </message>
     <message>
         <source>Save pin</source>
-        <translation>Сохранить PIN</translation>
+        <translation type="obsolete">Сохранить PIN</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
+    <message>
+        <source>Enter PIN:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation>Исходящее соединение с</translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation>Входящее соединение с</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/bluetooth-manager.ts b/i18n/ru/bluetooth-manager.ts
index f27fa19..2e08e27 100644
--- a/i18n/ru/bluetooth-manager.ts
+++ b/i18n/ru/bluetooth-manager.ts
@@ -1,340 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation>Менеджер Bluetooth</translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation>&lt;b&gt;Имя устройства : &lt;/b&gt; Ipaq</translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation>MAC адрес:</translation>
     </message>
     <message>
         <source>Class</source>
         <translation>Класс</translation>
     </message>
     <message>
         <source>Test</source>
         <translation>Тест</translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation>Изменения применены.</translation>
     </message>
     <message>
         <source>rescan sevices</source>
-        <translation>просканировать сервисы</translation>
+        <translation type="obsolete">просканировать сервисы</translation>
     </message>
     <message>
         <source>to group</source>
-        <translation>в группу</translation>
+        <translation type="obsolete">в группу</translation>
     </message>
     <message>
         <source>delete</source>
-        <translation>удалить</translation>
+        <translation type="obsolete">удалить</translation>
     </message>
     <message>
         <source>Test1:</source>
         <translation>Тест1:</translation>
     </message>
     <message>
         <source>no services found</source>
         <translation>сервисов не найдено</translation>
     </message>
     <message>
         <source>No connections found</source>
         <translation>Не найдено соединений</translation>
     </message>
+    <message>
+        <source>&amp;Rescan services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation>Имя устройства</translation>
     </message>
     <message>
         <source>Online</source>
         <translation>Онлайн</translation>
     </message>
     <message>
         <source>Scan for Devices</source>
-        <translation>Просканировать устройства</translation>
+        <translation type="obsolete">Просканировать устройства</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Соединения</translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation>Тип соединения</translation>
     </message>
     <message>
         <source>Signal</source>
         <translation>Сигнал</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Настройка</translation>
     </message>
     <message>
         <source>Bluetooh Basic Config</source>
         <translation type="obsolete">Основные настройки Bluetooth</translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation>Ключ по умолчанию</translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation>разрешить аутентификацию</translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation>разрешить шифрование</translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished">Разрешить Page scan</translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished">Разрешить Inquiry scan</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
         <source>Rfcomm Bind Table</source>
-        <translation>Таблица привязок Rfcomm</translation>
+        <translation type="obsolete">Таблица привязок Rfcomm</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Status Label</source>
         <translation>Метка статуса</translation>
     </message>
     <message>
         <source>Bluetooth Basic Config</source>
         <translation>Основная настройка Bluetooth</translation>
     </message>
+    <message>
+        <source>&amp;Rescan Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit RFCOMM Bind Table</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeviceDialog</name>
     <message>
         <source>Form2</source>
         <translation>Форма2</translation>
     </message>
     <message>
         <source>Devicename</source>
-        <translation>Имя устройства</translation>
+        <translation type="obsolete">Имя устройства</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Сервицы</translation>
     </message>
     <message>
         <source>change settings</source>
-        <translation>изменить настройки</translation>
+        <translation type="obsolete">изменить настройки</translation>
     </message>
     <message>
         <source>active</source>
         <translation>включен</translation>
     </message>
     <message>
         <source>service name</source>
         <translation>имя сервиса</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Change device 
 name</source>
-        <translation>Изменить имя
+        <translation type="obsolete">Изменить имя
 устройства</translation>
     </message>
     <message>
         <source>Default PIN 
 Code</source>
-        <translation>PIN-код по
+        <translation type="obsolete">PIN-код по
 умолчанию</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>TextLabel9</source>
         <translation>ТекстМетка9</translation>
     </message>
+    <message>
+        <source>&amp;Apply Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation>подключить</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>подключить+конф</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>отключить</translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation>отправить файлы</translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation>Какие файлы должны быть отправлены?</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation>Искать устройства</translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation>Начать поиск</translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation>Добавить устройство</translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation>Остановить поиск</translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation>ppp соединение</translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation>Введите имя скрипта ppp:</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Подключиться</translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation>подключить</translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation>подключить+конф</translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation>отключить</translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation>Rfcomm привязка</translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation>Привязать устройство к интерфейсу</translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation>Форма2</translation>
     </message>
     <message>
         <source>Mac</source>
         <translation>MAC</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Канал</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Заметки:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/calculator.ts b/i18n/ru/calculator.ts
index f257427..fdc3646 100644
--- a/i18n/ru/calculator.ts
+++ b/i18n/ru/calculator.ts
@@ -1,331 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tg</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Калькулятор</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Стандартный</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Стандартный</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Длина</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Площадь</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Температура</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Объем</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>акры</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
-        <translation>°C</translation>
+        <translation type="obsolete">°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>караты</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>см</translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation>куб. см</translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation>куб. футы</translation>
     </message>
     <message>
         <source>cu in</source>
         <translation>куб. дюймы</translation>
     </message>
     <message>
         <source>&#xb0;F</source>
-        <translation>°F</translation>
+        <translation type="obsolete">°F</translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation>жидк. унции</translation>
     </message>
     <message>
         <source>ft</source>
         <translation>футы</translation>
     </message>
     <message>
         <source>g</source>
         <translation>г</translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation>галлоны</translation>
     </message>
     <message>
         <source>hectares</source>
         <translation>гектары</translation>
     </message>
     <message>
         <source>in</source>
         <translation>дюймы</translation>
     </message>
     <message>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
         <source>km</source>
         <translation>км</translation>
     </message>
     <message>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
         <source>lb</source>
         <translation>фунты</translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
         <source>mg</source>
         <translation>мг</translation>
     </message>
     <message>
         <source>mi</source>
         <translation>мили</translation>
     </message>
     <message>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation>морские мили</translation>
     </message>
     <message>
         <source>oz</source>
         <translation>унции</translation>
     </message>
     <message>
         <source>points</source>
         <translation>пойнты</translation>
     </message>
     <message>
         <source>pt</source>
         <translation>пинты</translation>
     </message>
     <message>
         <source>qt</source>
         <translation>кварты</translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation>кв. см</translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation>кв. футы</translation>
     </message>
     <message>
         <source>sq in</source>
         <translation>кв. дюймы</translation>
     </message>
     <message>
         <source>sq km</source>
         <translation>кв. км</translation>
     </message>
     <message>
         <source>sq m</source>
         <translation>кв. м</translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation>кв. мили</translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation>кв. мм</translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation>кв. ярды</translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation>стл. ложки</translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation>ч. ложки</translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation>тонны</translation>
     </message>
     <message>
         <source>yd</source>
         <translation>ярды</translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/checkbook.ts b/i18n/ru/checkbook.ts
index 3be4e04..287d21c 100644
--- a/i18n/ru/checkbook.ts
+++ b/i18n/ru/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Чековая книжка</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Новая чековая книжка</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Транзакции</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Схемы</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Здесь введите имя чековой книги.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Здесь выберите тип чековой книги.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Банк:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Здесь ввведите имя банка чековой книги.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Номер счета:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Здесь введите номер счета чековой книги.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN код:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Здесь введите PIN код чековой книги.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Начальный баланс:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Здесь введите начальный баланс чековой книги.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Примечания:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Введите любую дополнительную информацию о чековой книжке здесь.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Это список всех транзакций, введенных в этой чековой книжке.
 
 Для сортировки транзакций по определенному полю щелкните по заголовку.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Сумма</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Щелкните здесь для добавления новой транзакции.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Выберите транзакцию и щелкните здесь для ее изменения.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Выберите чековую книгу и щелкните здесь для ее удаления.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Выберите требуемую диаграмму и щелкните по кнопке Нарисовать.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Щелкните здесь для выбора требуемого типа диаграммы.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Баланс счета</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Кредит по категориям</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Дебит по категориям</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Нарисовать</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Щелкните здесь для получения выбранной диаграммы.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Удалить транзакцию</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Защитить паролем</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Щелкните здесь для снятия/установки защиты чековой книги паролем.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Номер</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Пожалуйста введите пароль:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Подтвердите пароль</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Пожалуйста подтвердите ваш пароль:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Пожалуйста введите ваш пароль для подтверждения снятия защиты паролем:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation>Сортировать по:</translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation>Выберите порядок сортировки чековой книги.</translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation>Порядок ввода</translation>
     </message>
     <message>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
         <source>Id</source>
         <translation>ID</translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Баланс</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Настройка чековой книги</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Введите символ валюты:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Введите ваш символ валюты.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Показать защищена ли чековая книга
 паролем</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Щелкните здесь что бы определить будет ли в главном окне отображаться статус защиты паролем.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Показать баланс чековых книг</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Щелкните здесь чтобы выбрать будет ли в главном окне отображаться баланс каждой книги.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation>Новый тип счета</translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation>&amp;Типы счетов</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Новая категория</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Расход</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Приход</translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation>&amp;Категории</translation>
     </message>
     <message>
         <source>Payee</source>
         <translation>Получатель</translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation>Новый получатель</translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation>&amp;Получатели</translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation>Открыть последнюю книгу</translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation>Щелкните здесь чтобы выбрать будет ли последняя книга открываться при запуске.</translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation>Показать последнюю вкладку в книге</translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation>Щелкните здесь чтобы выбрать будет ли отображена последняя вкладка в книге.</translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation>Сохранять новые описания как получателей</translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation>Щелкните здесь чтобы сохранять новые описания в списке получателей.</translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Чековая книжка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Щелкните здесь для создания новой чековой книги.
 
 Вы также можете выбрать Новая из меню.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Выберите чековую книгу и щелкните здесь для ее изменения.
 
 Вы также можете выбрать Изменить в меню или нажать и удерживать название книги.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Выберите чековую книгу и щелкните здесь для ее удаления.
 
 Вы также можете выбрать Удалить из меню.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Это список всех доступных книг.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Удалить чековую книгу</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Настройка</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Щелкните здесь для настройки этого приложения.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Имя чековой книги</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Баланс</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Пожалуйста введите пароль:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Сберегательный</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Чековый</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Денежный рынок</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Другое</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation>Расходы</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Автомобиль</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Счета</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>Компакт-диски</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Одежда</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Компьютер</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation>Электроника</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Развлечения</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Еда</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Бензин</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Проч</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Фильмы</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Аренда</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Путешествие</translation>
     </message>
     <message>
         <source>Income</source>
         <translation>Заработок</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Работа</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Член семьи</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Проч кредиты</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Транзакция</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Кредит</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Выберите будет ли это транзакция кредит(расход) или дебит(приход).</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Дебит</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Дата:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Здесь выберите дату транзакции.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Номер:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Здесь введите номер чека.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Введите описание транзакции здесь.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Здес выберите категорию транзакции.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Выберите тип транзакции здесь.
 
 Доступные варианты зависят от того, является ли транзакция кредитом или дебитом.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Сумма:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Введите сумму транзакции здесь.
 
 Вводимое значение всегда должно быть положительным.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Плата:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Введите сумму начисленного процента по этой транзакции.
 
 Сумма должа быть положительной.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Примечания:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Введите любую дополнительную информацию по транзакции.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Дебиторская задолженность</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Выписанные чеки</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Передача</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Кредитка</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Автоматический платеж</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Наличные</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/datebook.ts b/i18n/ru/datebook.ts
index ba81064..e917561 100644
--- a/i18n/ru/datebook.ts
+++ b/i18n/ru/datebook.ts
@@ -142,688 +142,700 @@ Quit anyway?</source>
         <source>Friday</source>
         <translation>Пт</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сб</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Вс</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00в</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>С</translation>
     </message>
     <message>
         <source>End</source>
         <translation>По</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Это событие на весь день.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Отправить</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00веч</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00ут</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Веч</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Ут</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Свойства</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Начало просмотра</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>С:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Уст. сигнала</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Сигнал</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Смешанное</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Строка:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Средняя</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Большая</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Список</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>На тек. время</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ничего</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>С..до..</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation>Плагины</translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation>Список плагинов</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Это событие на весь день</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>н</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Янв-00. Янв</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation>ПВСЧПСВП</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>н</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Н: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>п</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Повтор...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Ежедневно...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Еженедельно...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Ежемесячно...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Ежегодно...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Нет повтора...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Время начала</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Время окончания</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Новое событие</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Место</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Встреча</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ужин</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Обед</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Путешествие</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дом</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Янв 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Время начала</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Весь день</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Час. пояс</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Сигнал</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>минут</translation>
+        <translation type="obsolete">минут</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Беззвучно</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Громко</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Нет повтора...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>С...по...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Заметки...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">дней</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Редакт. заметки</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Обед</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Оконч.</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 кажд.</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 кажд.</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Каждый</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Пон.</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вт.</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Ср.</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Чтв.</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пят.</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сб.</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Вск.</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>й</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>й</translation>
     </message>
     <message>
         <source>th</source>
         <translation>й</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>день(дни)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>мес.</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>год</translation>
     </message>
     <message>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недель</translation>
     </message>
     <message>
         <source>week</source>
         <translation>нед.</translation>
     </message>
     <message>
         <source>month</source>
         <translation>мес.</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, 
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation>на</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторяющееся</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ничего</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Нед.</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Мес.</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Заканчивается:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Нет даты оконч.</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пн.</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Вт.</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ср.</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв.</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн.</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб.</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск.</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждый</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Перем1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Перем 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>НедПерем</translation>
     </message>
     <message>
         <source>months</source>
         <translation>мес.</translation>
     </message>
     <message>
         <source>years</source>
         <translation>лет</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/embeddedkonsole.ts b/i18n/ru/embeddedkonsole.ts
index adbea12..e2f2690 100644
--- a/i18n/ru/embeddedkonsole.ts
+++ b/i18n/ru/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Выбор команды</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Команды</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Команды&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Предложенные команды&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Ввод</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Пробел</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Таб</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Показать список команд</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Скрыть список команд</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Зеленый на черном</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Черный на белом</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Белый на черном</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Зеленый на желтом</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Синий на малиновом</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Малиновый на синем</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Голубой на белом</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Белый на голубом</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Синий на черном</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Янтарный на черном</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Быстрая правка</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Слева</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Справа</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Полоса прокрутки</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Показать список команд</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Скрыть список команд</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Свой</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Список команд</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Перенос</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Использовать сигнал</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation>Консоль</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Снизу</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Сверху</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Скрыть</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation>Черный на розовом</translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation>Розовый на черном</translation>
     </message>
     <message>
         <source>default</source>
         <translation>по умолчанию</translation>
     </message>
     <message>
         <source>new session</source>
         <translation>новый сеанс</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Шрифты</translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation>Сеансы</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Увеличить</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Правка...</translation>
     </message>
     <message>
         <source>History...</source>
         <translation>История...</translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation>Чтобы выйти из полноэкранного режима, нажмите здесь.</translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation>Линий истории:</translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation>Консоль</translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Выбор команд</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Добавить команду</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Введите команду:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/go.ts b/i18n/ru/go.ts
index 302a554..d89436c 100644
--- a/i18n/ru/go.ts
+++ b/i18n/ru/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Новая игра</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Передать</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Сдаться</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Два игрока</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Белых %1, Черных %2. </translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Белые выиграли.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Черные выиграли.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Ничья.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Передаю ход</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Плененных: черных %1, белых %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/gutenbrowser.ts b/i18n/ru/gutenbrowser.ts
index 77a1770..88710e7 100644
--- a/i18n/ru/gutenbrowser.ts
+++ b/i18n/ru/gutenbrowser.ts
@@ -1,456 +1,464 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation>Правка названия</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation>Диалог шрифтов</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Скачать библиотечный индекс или FTP сайтов?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation>Вы хотите скачать свежий библиотечный
 индекс Проекта Гутенберг?
 или выбрать FTP сайт?
 </translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation>&amp;Библиотечный индекс</translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation>&amp;FTP сайт</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation>Поиск е-текста</translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation>Пожалуйста установите unzip</translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation>Библиотека Гутенберг</translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation>Гутенбраузер</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation>Искать на google.com</translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation>Правка названия</translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation>Пожалуйста установите unzip в вашем PATH</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Скачиваю индекс Гутенберга...</translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation>Основан на gutenbook.pl, доступен на http://www.gutenbook.org</translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation>Выражаем признательность Lee Burgess</translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation>за оригинальную идею и принцип гутенкниги.
 </translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation>Список текущих Гутенберг сайтов находится на http://promo.net/pg/index.html
 </translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation>Отсылайте отчеты об ошибках, комментарии и вопросы о Гутенбраузере по адресу</translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation>ljp@llornkcor.com</translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation>
 Написано с использованием Qt, Qt Embedded, и Qtopia, кросс-платформенного API
 http://www.trolltech.com
 
 </translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation>Законы документации Арнольда:</translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation>(1) Если она должна существовать, то ее нет.</translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation>(2) Если она существует, она уже устарела.</translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation>(3) Только документация для</translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation>бесполезных программ избегает</translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation>влияния первых двух законов.
 </translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation>В конце концов, ничто не вечно...
 :o)</translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation>&amp;Открыть файл</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation>&amp;Назад</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation>&amp;Вперед</translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation>&amp;Домой</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation>&amp;Перейти</translation>
     </message>
     <message>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Закладки</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Назад</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Вперед</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Домой</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Библиотечный индекс - используется главный индекс проекта.</translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation>Поиск по библиотеке</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Скачиваю Гутенберг индекс...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Название</translation>
     </message>
     <message>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>A-F</source>
         <translation>A-F</translation>
     </message>
     <message>
         <source>G-M</source>
         <translation>G-M</translation>
     </message>
     <message>
         <source>N-R</source>
         <translation>N-R</translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation>S-Z</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Открывать автоматически</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
-        <translation>Сначала фамилия 
+        <translation type="obsolete">Сначала фамилия 
 (необходим перезапуск библиотеки)</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Искать</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Ошибка открытия файла индекса библиотеки. Пожалуйста скачайте новый.&lt;/P&gt; </translation>
     </message>
+    <message>
+        <source>   </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>Закачка по FTP</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Загрузка скоро должна начаться</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation>Удалить е-текст</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation>&amp;Найти</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Учет регистра</translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation>Результаты поиска</translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation>&amp;Скачать</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation>Opera</translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation>Konqueror</translation>
     </message>
     <message>
         <source>wget</source>
         <translation>wget</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation>Скачиваю список FTP сайтов...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation>фтпСайтДлг</translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation>Не могу открыть файл списка.</translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation>Не смог открыть файл.</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Главные</translation>
     </message>
     <message>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation>http://sailor.gutenberg.org</translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation>http://www.prairienet.org/pg</translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation>Настройки Гутенбраузера</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/kpacman.ts b/i18n/ru/kpacman.ts
index 6c0b7b0..c9e1377 100644
--- a/i18n/ru/kpacman.ts
+++ b/i18n/ru/kpacman.ts
@@ -1,246 +1,250 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Изменить клавиши направления</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Незаданная клавиша</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Новая</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Пауза</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Доска почета</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Выйти</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Скрыть курсор мыши</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Выбрать тему графики</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Приостановить</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>П&amp;родолжить</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Изменить &amp;клавиши...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Игра Packman для KDE
 
 Эта программа основана на исходниках ksnake,
 созданной Michel Filippi (mfilippi@sade.rhein-main.de).
 Pacman (c) 1980 MIDWAY MFG.CO очень сильно
 повлиял на этот дизайн.
 
 Я хочу поблагодарить мою подругу Elke Krueers
 за последнии 10 лет дружбы.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Не могу создать битшрифт.
 
 Файл &apos;@FONTNAME@&apos; не существует или
 имеет неизвестный формат.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>ИГРА  ОКОНЧЕНА</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>ИГРОК НОМЕР ОДИН</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>ГОТОВ!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ПЕРСОНАЖ</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>КЛИЧКА</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-ТЕНЬ</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;МЕРЦАЮЩИЙ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-СКОРОСТНОЙ</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;РОЗОВАТЫЙ&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-СКРОМНЫЙ</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;ЧЕРНИЛЬНЫЙ&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-КОЛЮЧИЙ</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;КЛАЙД&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA ПОРТ: КАТАЛИН КЛИМОВ</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>НАЖМИТЕ НА КУРСОР ЧТОБЫ НАЧАТЬ</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>РЕКОРД</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     ПОЗДРАВЛЯЕМ     </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    ВЫ ДОСТИГЛИ    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  КОЛ-ВО ОЧКОВ В ТОП 10.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>ПОЗ   ОЧКИ  ИМЯ   ДАТА</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@ГГ@/@ММ@/@ДД@</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Не могу создать изображение.
 
 Файл &apos;@PIXMAPNAME@&apos; не существует или
 имеет неизвестный формат.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Ошибка инициализации</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libaboutapplet.ts b/i18n/ru/libaboutapplet.ts
index 42cb323..8bec1fd 100644
--- a/i18n/ru/libaboutapplet.ts
+++ b/i18n/ru/libaboutapplet.ts
@@ -1,98 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Ссылка &quot;О программе&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
 &lt;/p&gt;
 &lt;p&gt;
 Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
 &lt;/p&gt;
 &lt;p&gt;
 Зайдите на &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; чтобы получить дальнейшую информацию о проекте Opie.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Сообщить</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны сообщить нам когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
 &lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на &lt;i&gt;http://opie.han0dhelds.org/&lt;/i&gt; чтобы сообщить об ошибках.&lt;/p&gt;
 &lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Присоединяйтесь</translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вам не нужно быть разработчиком программного обеспечения чтобы стать членом команды Opie. Вы можете присоединиться к интернациональным командам которые переводят интерфейс программ. Вы можете предоставлять графику, темы, звуки, или улучшенную документацию. Выбирайте сами!&lt;/p&gt;
 &lt;p&gt;Зайдите на &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; чтобы узнать про проекты в которых вы можете участвовать.&lt;/p&gt;
 &lt;p&gt;Если вам нужно больше информации или документации, &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; даст вам все, что необходимо.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation>&lt;p&gt;
+        <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;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</translation>
     </message>
+    <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;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libbatteryapplet.ts b/i18n/ru/libbatteryapplet.ts
index 60e5118..87aa686 100644
--- a/i18n/ru/libbatteryapplet.ts
+++ b/i18n/ru/libbatteryapplet.ts
@@ -1,87 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Заряжается</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Статус аккумулятора:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Хороший</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Очень низкий</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критический</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>На запасном питании</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Питание подключено</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Внешний источник отключен</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Неудача</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>не смог открыть файл</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Заряжаются оба устройства</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Нету вставленного аккумулятора</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>нет данных</translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation>Куртка  </translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Осталось заряда: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Осталось времени: %1мин %2сек</translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
-        <translation>Осталось заряда: %1 %2
+        <translation type="obsolete">Осталось заряда: %1 %2
 Осталось времени: %3</translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation>Ipaq  %1</translation>
     </message>
+    <message>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libliquid.ts b/i18n/ru/libliquid.ts
index 9deb5af..7172cca 100644
--- a/i18n/ru/libliquid.ts
+++ b/i18n/ru/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Жидкость</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Стиль Жидкость</translation>
+        <translation type="unfinished">Стиль Жидкость</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Без полупрозрачности</translation>
+        <translation type="unfinished">Без полупрозрачности</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished">Пунктир, цвет фона</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished">Пунктир, цвет кнопок</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished">Полупрозрачный пунктир, цвет фона</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished">Полупрозрачный пунктир, цвет кнопок</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Своя полупрозрачность</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 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 type="unfinished">Стиль &quot;Высокопроизводительная жидкость&quot; by Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libmemoryapplet.ts b/i18n/ru/libmemoryapplet.ts
index 4248a5b..cdb41db 100644
--- a/i18n/ru/libmemoryapplet.ts
+++ b/i18n/ru/libmemoryapplet.ts
@@ -1,166 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Загрузка ЦП приложениами (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Загрузка ЦП системой (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Эта страница показывает загрузку центрального процессора на этом устройстве.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Эта страница показывает сколько памяти (ОЗУ) распределено на вашем устройстве.
 Показаны следующие категории:
 
 1. Используется - память используемая Opie и прочими запущенными приложениями.
 2. Буфера - память, временно отведенная под хранение данных для ускорения доступа
 3. Кэш - информация, которая была недавно использована, но еще не освобождена.
 4. Свободно - память которая пока никем не используется.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Всего памяти: %1 кбайт</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Использовано (%1 кбайт)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Буфера (%1 кбайт)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кэш (%1 кбайт)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Свободно (%1 кбайт)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Всего подкачки: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation>Статус памяти</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Память</translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation>Файл подкачки</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;b&gt;Плагин монитора памяти&lt;/b&gt;&lt;br&gt;Копирайт (C) 2003 Антон Масловский&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Основано на исходных текстах:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;Эта программа распространяется на условиях GNU GPL.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation>Расположение файла подкачки</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>ОЗУ</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>CF карта</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD карта</translation>
     </message>
     <message>
         <source> On </source>
         <translation>Вкл.</translation>
     </message>
     <message>
         <source> Off </source>
         <translation>Выкл.</translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation>Управление файлами подкачки</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Создать</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Убрать</translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation>Не смог отключить файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Файл подкачки отключен.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Не могу создать файл подкачки.</translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation>Не могу инициализировать файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation>Файл подкачки создан.</translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation>Не могу удалить файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation>Файл подкачки удален.</translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation>Файл подкачки подключен.</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>2 Mb,4 Mb,6 Mb,8 Mb,16 Mb,32 Mb,64 Mb</source>
         <translation>2 Мб,4 Мб,6 Мб,8 Мб,16 Мб,32 Мб,64 Мб</translation>
     </message>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopiecore2.ts b/i18n/ru/libopiecore2.ts
index 4828b1f..dde990f 100644
--- a/i18n/ru/libopiecore2.ts
+++ b/i18n/ru/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Кнопка календаря</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Кнопка контактов</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Кнопка почты</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Кнопка &quot;Запись&quot;</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Ниже+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Ниже+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Ниже+вправо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Ниже+влево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Выше+вверх</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Выше+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Выше+вправо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Выше+влево</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation>Кнопка действия</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Кнопка ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Кнопка &quot;End&quot;</translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation>Кнопка &quot;Задачи&quot;</translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation>Крышка1</translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation>Крышка2</translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation>Крышка3</translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation>Мусор</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopieobex.ts b/i18n/ru/libopieobex.ts
index aee3cda..54f8a4e 100644
--- a/i18n/ru/libopieobex.ts
+++ b/i18n/ru/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Принято:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Отказать</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Вы приняли файл типа %1 (&lt;img src=&quot;%2&quot;&gt; )Что вы хотите с ним сделать?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Отправляется:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Отправляется:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Готово</translation>
+        <translation type="obsolete">Готово</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa не разрешен!</translation>
+        <translation type="obsolete">IrDa не разрешен!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Ищу IrDa устройства.</translation>
+        <translation type="obsolete">Ищу IrDa устройства.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth недоступен</translation>
+        <translation type="obsolete">Bluetooth недоступен</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Ищу Bluetooth устройства.</translation>
+        <translation type="obsolete">Ищу Bluetooth устройства.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Планирую для отправки.</translation>
+        <translation type="obsolete">Планирую для отправки.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Нажмите чтобы отправить</translation>
+        <translation type="obsolete">Нажмите чтобы отправить</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Отправлено</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Неудача</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Попытка %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Искать снова используя IrDa.</translation>
+        <translation type="obsolete">Искать снова используя IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Начать отправку</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/libscreenshotapplet.ts b/i18n/ru/libscreenshotapplet.ts
index fb3ade8..58ee3cf 100644
--- a/i18n/ru/libscreenshotapplet.ts
+++ b/i18n/ru/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Имя снимка</translation>
+        <translation type="obsolete">Имя снимка</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>Задержка</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>сек</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>Сохранить под именем</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>Сохранить снимок как...</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>Снять</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Успех</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Снимок загружен на %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
         <translation>Соединение с %1 неудалось.</translation>
     </message>
     <message>
         <source>Opie drawpad</source>
         <translation>Opie холст</translation>
     </message>
     <message>
         <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
         <translation>Пожалуйста задайте переменную среды &lt;b&gt;QWS_DISPLAY&lt;/b&gt;.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libtodaydatebookplugin.ts b/i18n/ru/libtodaydatebookplugin.ts
index 5cd5eb9..512bedc 100644
--- a/i18n/ru/libtodaydatebookplugin.ts
+++ b/i18n/ru/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[со звонком]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>заметка</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Весь день</translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>ЕжедневникПлагинКонфигБаза</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Показать место</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Отметьте здесь если должны отоброжаться места встреч</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation>Показать заметки</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation>Отметьте здесь если должны отоброжаться заметки к записям</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation>Показать только следующие встречи</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation>Отметьте если только встречи после настоящего времени дожны быть показаны</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation>Показать время в отдельной строке</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation>Сколько встреч должны быть отображены(макс.). В хронологическом порядке</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation>Сколько встреч должны быть показаны?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>только сегодня</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation>Сколько еще дней должно быть в диапазоне</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation>Сколько еще дней</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Плагин Ежедневника</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Сегодня встреч больше нет</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Сегодня встреч нет</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/odict.ts b/i18n/ru/odict.ts
index e10ee36..20fa1cb 100644
--- a/i18n/ru/odict.ts
+++ b/i18n/ru/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Метод поиска</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Словарь</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Запрос:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Методы поиска</translation>
+        <translation type="obsolete">Методы поиска</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Учет регистра</translation>
+        <translation type="obsolete">&amp;Учет регистра</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Параметр</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>Не задан словарь</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>&amp;Задать</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Конфигурация</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Opie-Словарь</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Файл словаря</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Язык 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Сортировка</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Язык 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Новый метод поиска</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Изменить метод поиска</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/opieirc.ts b/i18n/ru/opieirc.ts
index 7621a81..76dd469 100644
--- a/i18n/ru/opieirc.ts
+++ b/i18n/ru/opieirc.ts
@@ -3,721 +3,732 @@
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation>Принимаю файл %1 от %2...</translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation>Успешно принял %1</translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation>Отменено</translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation>Отменено</translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation>Таймаут</translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation>Идет передача DCC</translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation>Есть незавершенные передачи. &lt;br&gt;Если вы закроете эту вкладку, они будут отменены.&lt;br&gt;Вы все равно хотите закрыть?</translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation>&amp;Закрыть</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation>&amp;Не закрывать</translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation>DCC передача от %1</translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation>%1 пытается послать вам файл %2
 (%3 байт)</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Принять</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation>&amp;Отказаться</translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Разговор на канале</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Беседа канала</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Введите здесь свое сообщение, чтобы поучаствовать в беседе</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Отсоединен</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Подключен, вхожу ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Вошел успешно.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Ошибка сокета : </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Соединение закрыто</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation>Следующая вкладка</translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation>Предыдущая вкладка</translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation>Закрыть вкладку</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Несуществующий канал - не синхронизирован?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Человек уже присоединился к каналу - не синхронизирован?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Вы уже присоединились к каналу - не синхронизирован?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Уходящий человек не найден - не синхронизирован?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Канал для отключения не найден - не синхронизирован?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Сообщение на канале с неизвестным отправителем</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Принято PRIVMSG неизвестного типа</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Выход неизвестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>тема сменена на</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Неизвестная тема на канале - не синхронизирован?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Принят CTCP PING от</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION с неизвестным человеком - не синхронизирован?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION с неизвестным каналом - не синхронизирован?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION с плохим адресатом</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Смена режима с неизвестным типом</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Смена режима для неизвестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Смена режима с неизвестным флагом</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Смена режима с неизвестным каналом - не синхронизирован?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Пользовательские режимы пока не поддерживаются</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Вы были выброшены с</translation>
     </message>
     <message>
         <source> by </source>
         <translation></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>был выброшен с</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Выброс неизестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Выброс неизвестного канала - не синхронизирован?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Сообщение сервера с неизвестным каналом</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Вы присоединились к каналу</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Кличка уже используется, пожалуйста пересоединитесь с другой</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Нет такой клички</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>Принята необработанная цифровая команда: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>Принята необработанная ctcp команда: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>Принята необработанная буквенная команда: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>%1 подключился к каналу %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>Вы ушли с канала %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 ушел с канала %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Сообщение канала с неизвестного канала %1</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 вышел (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Сервер %1 версии %2 поддерживает режимы пользователей &apos;%3&apos; и режимы канала &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Подключено %1 операторов</translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation>%1 неизвестных соединений</translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation>%1 каналов сформировано</translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation>Пожалуйста подождите и попробуйте снова</translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation>Whois %1 (%2@%3)
 Настоящее имя: %4</translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation>%1 использует сервер %2</translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation>%1 находится на каналах: %2</translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation>Имена %1: %2</translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation>Время на сервере %1 - %2</translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation>Канал или ник %1 не существует</translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation>Нет информации об истории %1</translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation>Неизвестная команда: %1</translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation>Не могу сменить ник на %1: %2</translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation>Вы не находитесь на канале %1</translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation>[%1] Действие не разрешено, у вас недостаточно привилегий на канале</translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation>Подключен к</translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation>%1 неактивен %2</translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation>%1 зарегистрировался на %2</translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation>CTCP PING с неизвестным человеком - десинхронизирован?</translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING с неизвестным каналом - десинхронизирован?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP ACTION с плохим адресатом</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>Получил запрос CTCP VERSION от</translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>Принят CTCP PING ответ от %1: %2 секунд</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>Принят CTCP PING запрос от %1</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Неверный DCC запрос от %1</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Сохранить как</translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Разговор с</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Приватный разговор</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Здесь введите свое сообщение чтобы отправить другому человеку</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Отключен</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Имя профиля :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Имя этого профиля сервера в в обзоре</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Имя хоста :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Сервер, к которому нужно подключиться - может быть любым хостом или IP адресом</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Порт :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Порт на сервере, к которому нужно подключиться. Обычно 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Ник :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Ваш ник на IRC сети</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Настоящее имя :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Ваше настоящее имя</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Пароль :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Пароль для соединения с сервером (если необходимо)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Каналы :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Список всех каналов, через запятую, к которым вы хотите подключится автоматически</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Изменить информацию о сервере</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Необходимо имя профиля</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Необходимо имя хоста</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Необходима кличка</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>Список каналов должен содержать
+        <translation type="obsolete">Список каналов должен содержать
 список имен каналов через запятую
 которые начинаются с &apos;#&apos; или &apos;+&apos;</translation>
     </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Список серверов</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Пожалуйста выберите профиль сервера</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Выберите профиль сервера из этого списка и нажмите OK в правом верхнем углу</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Удалить выбранный профиль сервера</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Изменить выбранный профиль сервера</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Добавить новый профиль сервера</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>Сообщения сервера</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Здесь вводите команды. Список доступных команд находится внутри справки OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Подключаюсь к</translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation>Вы теперь известны как %1</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Смена ника неизвестного человека</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation>%1 теперь известен как %2</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Число отображаемых строк :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Число отображаемых строк в чатах прежде чем они удаляются - это необходимо чтобы ограничить расход памяти. Установите на 0 если вам это не нужно</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Цвет фона :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Цвет фона, используемый в чатах</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Цвет обычного текста :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Цвет текста, используемого в чатах</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Цвет ошибок :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Цвет текста, используемого для отображения ошибок</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Текст, написанный вами :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный вами</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Текст, написанный другими :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный другими</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Текст, написанный сервером :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Цвет текста, используемого чтобы видеть текст написанный сервером</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Уведомления :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Цвет текста, используемого для отображения уведомлений</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation>Показывать время в журнале чата</translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation>Клавиатурные команды</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Нету описания</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Описание содержания этой вкладки</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Закрыть эту вкладку</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>IRC Клиент</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Соединения с серверами, каналами, запросы и прочие вещи будут здесь</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Новое соединение</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Создать новое соединение с IRC сервером</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Настроить поведение и внешний вид OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation>Opie IRC</translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation>дает статус оператора канала</translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation>забирает статус оператора канала у</translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation>дает голос</translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation>забирает голос у</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/security.ts b/i18n/ru/security.ts
index 1673d7c..4ae81d5 100644
--- a/i18n/ru/security.ts
+++ b/i18n/ru/security.ts
@@ -1,270 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation>ЛогинБаза</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Войти</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Входить автоматически</translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation>Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
 
 На Zaurus 5x00 это всегда пользователь &quot;root&quot;.</translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation>Этот список позволит выбрать пользователя для авто-входа
 (если разрешен).  
 
 Вы можете выбрать только уже настроенное имя пользователя.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation>Настройки безопасности</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Загрузить плагины в следующем порядке:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation>Поставьте флажок чтобы активировать плагин или используйте стрелки справа чтобы изменить порядок, в котором они будут показаны</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Выше</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
         <source>plugins</source>
         <translation>плагины</translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation>Аутентификация</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Войти</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Любой</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ни одного</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation>Важное замечание</translation>
     </message>
     <message>
         <source>Locking</source>
         <translation>Блокировка</translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation>Все заданные пользователем участки будут потеряны.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
         <translation>Чтобы защитить ваш КПК одним или более плагином аутентификации (например, простой ввод ПИН), вы должны установить хотя бы один &lt;em&gt;opie-securityplugin-*&lt;/em&gt; пакет! Как только вы это сделаете, здесь вы сможете настроить защиту вашего КПК.</translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Когда заблокировать Opie</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>при запуске Opie</translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation>при включении Opie</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Аутентификация со множественными плагинами</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Необходимо успешных</translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Не блокировать этот экран настройки</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Показывать объяснительные экраны</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Testing</source>
         <translation>Проверка</translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation>Проверить аутентификацию</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation>Сначала вы должны сохранить текущие настройки. Нажмите &quot;Да&quot;, чтобы принять и запустить демонстрацию процесса аутентификации.</translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation>Если вам не нравится результат этой проверки, не забудьте изменить настройки до выхода из приложения!</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation>СинхБаза</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Принимать запросы из сети:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation>Выберите или введите новый участок сети.  
 
 Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
 
 Например, участок сети 192.168.1.0/24 позволит любой машине с IP между 192.168.1.1 и 192.168.1.254 подключаться к (и синхронизироваться с) вашим КПК.  
 
 Запись &quot;Все&quot; позволит подключиться *любому* IP. 
 Запись &quot;Ни одного&quot; *запретит* все соединения.  
 
 Если неуверены, выберите &quot;Все&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Удалить запись</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation>Удалить выбранный участок из списка
 
 Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
 
 Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
 восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation>Эта кнопка восстановит список участков сети
 по умолчанию.
 
 Учтите что вручную введенные участки будут потеряны!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Выберите программу</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation>Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>Изменить протокол синхронизации для разных устройств.
+        <translation type="obsolete">Изменить протокол синхронизации для разных устройств.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync запретит проверку пароля но будет запрашивать подтверждение на прием соединения.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 совместим с QtopiaDesktop, MultiSync и KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 изменит способ пересылки данных клиенту и не будет работать со старыми клиентами.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
     </message>
+    <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/ru/sysinfo.ts b/i18n/ru/sysinfo.ts
index d1d64e1..0dea97d 100644
--- a/i18n/ru/sysinfo.ts
+++ b/i18n/ru/sysinfo.ts
@@ -1,364 +1,379 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Эта вкладка показывает доступные тесты, их результаты, и данные для сравнения их с выбранным устройством. Отметьте галочки напротив тестов, которые вы хотите провести.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Тесты</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Результаты</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Сравнение</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Целые числа  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Сопроцессор  </translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Вывод текста  </translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Вывод графики  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Производительность ОЗУ  </translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Производительность SD карты  </translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Производительность CF карты  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Начать тесты!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Нажмите здесь чтобы начать выбранные тесты.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Выберите модель для сравнения результатов.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>График показывает использование памяти на комакт-флэш карте.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>График показывает использование места на жестком диске.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>График показывает использование памяти на SD-карте.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>В</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>График показывает использование встроенной памяти (флэш-памяти) данного устройства.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>График показывает использование виртуального диска.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Процессор ( программы ),%</translation>
+        <translation type="obsolete">Процессор ( программы ),%</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Процессор ( система ), %</translation>
+        <translation type="obsolete">Процессор ( система ), %</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Тип:</translation>
+        <translation type="obsolete">Тип:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>Страница отображает использование процессора.</translation>
+        <translation type="obsolete">Страница отображает использование процессора.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Используется (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Буфер (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кэш (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Свободно (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Всего памяти: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Эта вкладка показывает как память(т.е. RAM) распределена на вашем устройстве.
 Память разделена на следующие категории:
 
 1. Занято - память используемая Opie и открытыми приложениями.
 2. Буфера - временное хранение для увеличения производительности.
 3. Кэш - информация которая была недавно использована, но еще не освобождена.
 4. Свободная - память не используемая Opie или открытыми приложениями.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Подкачки: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модуль</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Исп.#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Список модулей, загруженных в данное время.
 
 Нажмите и удерживайте модуль, чтобы получить дополнительную инф. или выгрузить его.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Выберите команду и щелкните &quot;Послать&quot;, чтобы послать команду выбранному модулю.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Послать</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Щелкните для того, чтобы послать команду выделенному модулю.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Детальная информация о данном модуле.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Используется</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Вы действительно хотите выполнить
 %1 для этого модуля?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Исп. (%1 кбайт)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Доступно (%1 кбайт)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кбайт</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Список выполняющихся процессов.
 Нажмите и удерживайте процесс, чтобы получить добавочную информацию или послать ему сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Выберите сигнал и нажмите &quot;Послать&quot;.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Послать</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Щелкните, чтобы послать сигнал этому процессу.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Детальная информация о данном процессе.</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Действительно хотите
 послать %1 этому процессу?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Системная Информация</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Память</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Диск</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>Процессор</translation>
+        <translation type="obsolete">Процессор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процессы</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation>Бенчмарки</translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation>Системный журнал</translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Ядро&lt;/b&gt;&lt;p&gt;Версия:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Сборка:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Версия:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Собрано:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Версия:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Вкладка отображает текущую версию Opie, ядра Linux и дистрибутива, установленных на устройстве.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation>&lt;br&gt;Модель:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Производитель:</translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation>Собрано для Qt/E </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/today.ts b/i18n/ru/today.ts
index 9b93e01..9382e66 100644
--- a/i18n/ru/today.ts
+++ b/i18n/ru/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пожалуйста, заполните бизнес-карту</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Нет активированных плагинов</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Щелкните для ассоциаций программ</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Владелец</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Ошибка Сегодня</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Плагин &apos;%1&apos; вызвал обрушение программы Сегодня. Возможно, что плагин неправильно установлен.&lt;br&gt;Сегодня попробует продолжить загрузку плагинов.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Сегодня by Maximilian Reiß</translation>
+        <translation type="obsolete">Сегодня by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Щелкните для диалога конфигурации</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Загрузить с плагинами в порядке:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Вверх</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Вниз</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Активировать/порядок</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Прочие</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Щелкните для активации/деактивации плагина или используйте кнопки со стрелками для изменения порядка</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Конфигурация</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Щелкните, если &quot;Сегодня&quot; должен автоматически загружаться</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation>загружать автоматически?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>крошечный заголовок</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Маленький заголовок</translation>
     </message>
     <message>
         <source> min</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Сколбко минут КПК был выключен до того как автозапуск включается после перерыва</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>минут неактивен</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>пиксель</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Установить размер иконки в пикселях</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>размер иконок</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation>никогда</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Как часто нужно обновлять Сегодня</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>обновить</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/zsafe.ts b/i18n/ru/zsafe.ts
index a7d88cd..f9eef62 100644
--- a/i18n/ru/zsafe.ts
+++ b/i18n/ru/zsafe.ts
@@ -1,578 +1,630 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Пиктограмма</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Поле 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Информация:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Новая запись</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>ФайлДлг</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>фильтр типов файлов</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>КомбоСписок ФайлТипФильтр
 
 правка или выбор фильтра</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>подтверждает выбор и закрывает форму</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Кнопка &quot;Да&quot;</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>отменяет выбор и закрывает форму</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Кнопка &quot;Отмена&quot;</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>показывает выбранное имя файла</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Правка имен файлов
 
 показывает выбранный файл
 и позволяет на лету изменить
 имя файла</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>КомбоСписок Каталогов
 
 правка или выбор каталогов</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>size</source>
         <translation>размер</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>каталоги в виде списка</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Каталоги в виде списка
 
 показывает список каталогов и файлов</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>папка</translation>
     </message>
     <message>
         <source>file</source>
         <translation>файл</translation>
     </message>
     <message>
         <source>link</source>
         <translation>ссылка</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Пожалуйста подождите...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Сохранить документ</translation>
+        <translation type="obsolete">&amp;Сохранить документ</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>С&amp;охранить документ с новым паролем</translation>
+        <translation type="obsolete">С&amp;охранить документ с новым паролем</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>&amp;Экспорт текст файла</translation>
+        <translation type="obsolete">&amp;Экспорт текст файла</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>&amp;Импорт текст файла</translation>
+        <translation type="obsolete">&amp;Импорт текст файла</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>&amp;Удалить текст файл</translation>
+        <translation type="obsolete">&amp;Удалить текст файл</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>О&amp;ткрывать записи в раскрытом виде</translation>
+        <translation type="obsolete">О&amp;ткрывать записи в раскрытом виде</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>В&amp;ыйти</translation>
+        <translation type="obsolete">В&amp;ыйти</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Файл</translation>
+        <translation type="obsolete">&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Создать</translation>
+        <translation type="obsolete">&amp;Создать</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Правка</translation>
+        <translation type="obsolete">&amp;Правка</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Категория</translation>
+        <translation type="obsolete">&amp;Категория</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Вырезать</translation>
+        <translation type="obsolete">&amp;Вырезать</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Копировать</translation>
+        <translation type="obsolete">&amp;Копировать</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Вставить</translation>
+        <translation type="obsolete">&amp;Вставить</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Поиск</translation>
+        <translation type="obsolete">&amp;Поиск</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Запись</translation>
+        <translation type="obsolete">&amp;Запись</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;О программе</translation>
+        <translation type="obsolete">&amp;О программе</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>С&amp;правка</translation>
+        <translation type="obsolete">С&amp;правка</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Создать документ</translation>
+        <translation type="obsolete">&amp;Создать документ</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>О&amp;ткрыть документ</translation>
+        <translation type="obsolete">О&amp;ткрыть документ</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Сохранить документ как ..</translation>
+        <translation type="obsolete">&amp;Сохранить документ как ..</translation>
     </message>
     <message>
         <source>New entry</source>
-        <translation>Добавить запись</translation>
+        <translation type="obsolete">Добавить запись</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
-        <translation>Правка категории или записи</translation>
+        <translation type="obsolete">Правка категории или записи</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
-        <translation>Удалить категорию или запись</translation>
+        <translation type="obsolete">Удалить категорию или запись</translation>
     </message>
     <message>
         <source>Find entry</source>
-        <translation>Поиск записи</translation>
+        <translation type="obsolete">Поиск записи</translation>
     </message>
     <message>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Вы хотите удалить?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Не удалять</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Имя записи должно отличаться
 от имени категории.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Запись не найдена</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation>Удалить текстовый файл</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation>Не могу удалить текстовый файл.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation>Документы не заданы.
 Вы должны создать новый документ</translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation>Экспорт в текстовый файл</translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation>Импорт из текстового файла</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation>Не смог экспортировать в текст файл.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation>Не смог импортировать из текст файла.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation>Неверный пароль.
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation>Неверный пароль.
 Попробовать снова?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation>&amp;Нет.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation>Пустой документ или
 неверный пароль.
 Продолжить?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;нет</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation>&amp;Да.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation>Пароль пуст.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation>Введите пароль снова</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation>Пароли должны быть одинаковыми.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation>Вы хотите сохранить</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation>
 прежде чем продолжить?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation>&amp;Не сохранять</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation>Файл паролей сохранен.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation>Вы хотите сохранить
 перед выходом?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation>С&amp;охранить
 с новым
 паролем</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Диалог ожидания</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Собираю пиктограммы...</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Теперь вы должны дважды
 ввести пароль для только
 что созданного документа.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Открыть документ ZСейф</translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Не могу создать каталог %1&lt;/P&gt;&lt;P&gt;ZСейф будет закрыт.&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZСейф:</translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Документы не заданы. Вы должны создать новый документ&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation>&lt;P&gt;Сначала вы должны создать новый документ. Создать?&lt;/P&gt;</translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Менеджер Паролей&lt;br&gt;ZСейф версии 2.1.2-jv01b&lt;br&gt;&lt;/b&gt;написан Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Перевод Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="obsolete">&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Менеджер Паролей&lt;br&gt;ZСейф версии 2.1.2-jv01b&lt;br&gt;&lt;/b&gt;написан Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Перевод Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation>Показать информацию</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/bluepin.ts b/i18n/sl/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/sl/bluepin.ts
+++ b/i18n/sl/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/bluetooth-manager.ts b/i18n/sl/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/sl/bluetooth-manager.ts
+++ b/i18n/sl/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/calculator.ts b/i18n/sl/calculator.ts
index 82d8fbc..24c87b9 100644
--- a/i18n/sl/calculator.ts
+++ b/i18n/sl/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Kalkulator</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Običajen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Običajen</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index aea0e49..46bdfff 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -1,646 +1,654 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova čekovna knjižica</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcije</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafi</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Vpišite ime čekovne knjižice.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Izberite tip čekovne knjižice.</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banka:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Vpišite ime banke za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Številka računa:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Vpišite številko računa za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Številka PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Vpišite številko PIN za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Začetno stanje:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Vpišite začetno stanje za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Vpišite dodatne informacije za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>To je seznam vseh vnesenih transakcij za to čekovno knjižico.
 
 Da uredite vnose po določenem polju, kliknite na ime stolpca.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Vsota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknite tu, da dodate novo transakcijo.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Izberite transakcijo, nato pa kliknite tu, da jo uredite.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Izberite željen graf spodaj in nato kliknite na gumb Riši.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknite tu, da izberete željeni tip grafa.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Stanje računa</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Dvigi po kategoriji</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Pologi po kategoriji</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Riši</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknite tu, da narišem izbran graf.</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Izbriši transakcijo</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Zaščita z geslom</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknite tu, da vključite/izključite zaščito z geslom na čekovni knjižici.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Številka</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite vaše geslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potrdite geslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prosim potrdite vaše geslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prosim vnesite vaše geslo, da potrdite odstranitev zaščite z geslom:</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Stanje</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Spremeni nastavitve čekovne knjižice</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Vpšite simbol za valuto:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Vpišite vaš lokalen simbol za valuto.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Prikaži, če je čekovna knjižica zaščitena
 z geslom</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže ali je čekovna knjižica zaščitena z geslom.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Prikaži stanja čekovne knjižice</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže trenutno stanje za vsako čekovno knjižico.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknite tu, da ustvarite novo čekovno knjižico.
 
 Lahko pa tudi izberete Nova iz menuja.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo uredite.
 
 Lahko tudi izberete Uredi iz menija ali pa kliknete in zadržite na imenu čekovne knjižice.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.
 
 Lahko tudi izberete Izbriši iz menuja.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To je seznam vseh čekovnih knjižic, ki so trenutno na voljo.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Izbriši čekovno knjižico</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknite tu, da spremenite nastavitve za ta program.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Stanje</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite geslo:</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Uredi</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Nova</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Prihranki</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Preverjam</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Denarni trg</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Skupni fond</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Drugo</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Računi</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDji</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Potovanje</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Različni krediti</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcija za</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Dvig</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Izberite ali je transakcija dvig ali polog.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Polog</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Izberite datum za transakcijo.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Številka:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Vpišite številko čeka.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Vpišite opis transakcije.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Izberite kategorijo transakcije.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Izberite tip transakcije.
 
 Možnosti, ki so na voljo so odvisne od tega ali je transakcija polog ali pa dvig.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Vsota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto transakcije.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Pristojbina:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto pristojbine povezane s to transakcijo.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Vnesite dodatne informacije za transakcijo.</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditna kartica</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotovina</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index f4394d2..548152c 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -135,696 +135,708 @@ Izhod?</translation>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Podvoji</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začni pregledovati dogodke</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Začetni čas:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavitev alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prednastavitev alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stil vrstice:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzet</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Srednji</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velik</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Pogledi</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Privzet pogled:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Tedenski seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skoči na trenutni čas</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Prikaz časa</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začetek-Konec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Uredi</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Prežarči</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ponovi...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dnevno...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tedensko...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mesečno...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Letno...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Začetni čas</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Končni čas</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nov dogodek</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Sestanek</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Kosilo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večerja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cel dan</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minut</translation>
+        <translation type="obsolete">minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tiho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glasno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časovni pas</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začetek - Konec</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opombe...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">dni</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Uredi opombo</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Kosilo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Vsak %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Vsak %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 od vsakega</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ne ponovi</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mesecev</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>week</source>
         <translation>teden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source> and </source>
         <translation>in</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 in</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, in</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ponavljajoči dogodek</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Vsak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frekvenca</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končaj na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>TedenskaSpremenljivka</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meseci</translation>
     </message>
     <message>
         <source>years</source>
         <translation>leta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index 13a8dc6..6cb59b1 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Ukazi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Ukazi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Predlagani ukazi&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Presledek</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zelena na črni</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Črna na beli</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bela na črni</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zelena na rumeni</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modra na Vijolčni</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Vijolčna na modri</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Svetlo modra na beli</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bela na svetlo modri</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modra na črni</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Drsnik</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Po izbiri</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Seznam ukazov</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Prelom vrstice</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Uporabi piskanje</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj ukaz</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vpiši ukaz, ki naj ga dodam:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/go.ts b/i18n/sl/go.ts
index dd35490..d5c1ecb 100644
--- a/i18n/sl/go.ts
+++ b/i18n/sl/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nova igra</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Odstopam</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Dva igralca</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Beli %1, Črni %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Beli so zmagal.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Črni so zmagal.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Neodločeno.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Ujetniki: črni %1, beli %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/gutenbrowser.ts b/i18n/sl/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/sl/gutenbrowser.ts
+++ b/i18n/sl/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libaboutapplet.ts b/i18n/sl/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/sl/libaboutapplet.ts
+++ b/i18n/sl/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index ff53425..aa11540 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Polnim</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Status baterije:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dober</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nizek</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Zelo nizek</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritičen</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznan</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Na pomožnem napajanju</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Napajanje priklopljeno</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Zunanje napajanje odklopljeno</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>ne morem odpreti datoteke</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Polnim obe napravi</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Baterija ni vstavljena</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libliquid.ts b/i18n/sl/libliquid.ts
index 0a2fe89..471b37e 100644
--- a/i18n/sl/libliquid.ts
+++ b/i18n/sl/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libmemoryapplet.ts b/i18n/sl/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/sl/libmemoryapplet.ts
+++ b/i18n/sl/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopiecore2.ts b/i18n/sl/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/sl/libopiecore2.ts
+++ b/i18n/sl/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopieobex.ts b/i18n/sl/libopieobex.ts
index b1f483e..9ffdb7c 100644
--- a/i18n/sl/libopieobex.ts
+++ b/i18n/sl/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished">Sprejmi</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Zavrni</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished">Končano</translation>
+        <translation type="obsolete">Končano</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation type="unfinished">IrDa ni vklopljen!</translation>
+        <translation type="obsolete">IrDa ni vklopljen!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation type="unfinished">Iščem IrDa naprave.</translation>
+        <translation type="obsolete">Iščem IrDa naprave.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation type="unfinished">Bluetooth ni na voljo</translation>
+        <translation type="obsolete">Bluetooth ni na voljo</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation type="unfinished">Iščem bluetooth naprave.</translation>
+        <translation type="obsolete">Iščem bluetooth naprave.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation type="unfinished">Razvrščam za prežarčenje.</translation>
+        <translation type="obsolete">Razvrščam za prežarčenje.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation type="unfinished">Klikni za prežarčenje</translation>
+        <translation type="obsolete">Klikni za prežarčenje</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished">Poslano</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished">Napaka</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished">Probaj %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation type="unfinished">Ponovno išči IrDa.</translation>
+        <translation type="obsolete">Ponovno išči IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished">Začni pošiljati</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libscreenshotapplet.ts b/i18n/sl/libscreenshotapplet.ts
index 0daab17..7c2e127 100644
--- a/i18n/sl/libscreenshotapplet.ts
+++ b/i18n/sl/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>Ime posnetka</translation>
+        <translation type="obsolete">Ime posnetka</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/sl/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/sl/libtodaydatebookplugin.ts
+++ b/i18n/sl/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/odict.ts b/i18n/sl/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/sl/odict.ts
+++ b/i18n/sl/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opieirc.ts b/i18n/sl/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/sl/opieirc.ts
+++ b/i18n/sl/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/sl/sysinfo.ts
index 26d82e8..5c2302d 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -1,353 +1,364 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Uporaba CPE v aplikacijah (%)</translation>
+        <translation type="obsolete">Uporaba CPE v aplikacijah (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Uporaba CPE v sistemu (%)</translation>
+        <translation type="obsolete">Uporaba CPE v sistemu (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Type: </translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Medpomnilniki (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Predpomneno (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Prosto (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Skupen spomin: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uporabi#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Na voljo (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Ukaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacija o sistemu</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Spomin</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Pomnilnik</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>CPE</translation>
+        <translation type="obsolete">CPE</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Različica</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux jedro&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Prevedel: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zgrajeno na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index c21ad0b..dfcee6b 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Danes</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</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>
     <message>
         <source>Today</source>
         <translation type="unfinished">Danes</translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Različno</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/zsafe.ts b/i18n/sl/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/sl/zsafe.ts
+++ b/i18n/sl/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/bluepin.ts b/i18n/xx/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/xx/bluepin.ts
+++ b/i18n/xx/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/bluetooth-manager.ts b/i18n/xx/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/xx/bluetooth-manager.ts
+++ b/i18n/xx/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index 66f866b..2be68ee 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>log</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>=</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>x</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/checkbook.ts b/i18n/xx/checkbook.ts
index 10dd1b4..433ac82 100644
--- a/i18n/xx/checkbook.ts
+++ b/i18n/xx/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 8dc1ec4..faa62a9 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -145,679 +145,691 @@ Quit anyway?</source>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/embeddedkonsole.ts b/i18n/xx/embeddedkonsole.ts
index fbb06e6..9790b30 100644
--- a/i18n/xx/embeddedkonsole.ts
+++ b/i18n/xx/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/go.ts b/i18n/xx/go.ts
index 41de802..81ccea4 100644
--- a/i18n/xx/go.ts
+++ b/i18n/xx/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/gutenbrowser.ts b/i18n/xx/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/xx/gutenbrowser.ts
+++ b/i18n/xx/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libaboutapplet.ts b/i18n/xx/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/xx/libaboutapplet.ts
+++ b/i18n/xx/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index ba37eb5..6d7307d 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libliquid.ts b/i18n/xx/libliquid.ts
index d42dee4..a011004 100644
--- a/i18n/xx/libliquid.ts
+++ b/i18n/xx/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libmemoryapplet.ts b/i18n/xx/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/xx/libmemoryapplet.ts
+++ b/i18n/xx/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiecore2.ts b/i18n/xx/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/xx/libopiecore2.ts
+++ b/i18n/xx/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopieobex.ts b/i18n/xx/libopieobex.ts
index 70e6d6d..4421f12 100644
--- a/i18n/xx/libopieobex.ts
+++ b/i18n/xx/libopieobex.ts
@@ -1,76 +1,139 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error :(</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>not enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libscreenshotapplet.ts b/i18n/xx/libscreenshotapplet.ts
index e2e0b3d..7cb2a80 100644
--- a/i18n/xx/libscreenshotapplet.ts
+++ b/i18n/xx/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>sec</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save named</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/xx/libtodaydatebookplugin.ts
index e30a8e5..b09ba8c 100644
--- a/i18n/xx/libtodaydatebookplugin.ts
+++ b/i18n/xx/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished">FOO</translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/odict.ts b/i18n/xx/odict.ts
index 1a624e8..ee185f2 100644
--- a/i18n/xx/odict.ts
+++ b/i18n/xx/odict.ts
@@ -1,111 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opieirc.ts b/i18n/xx/opieirc.ts
index 9007173..e021ce0 100644
--- a/i18n/xx/opieirc.ts
+++ b/i18n/xx/opieirc.ts
@@ -1,719 +1,730 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index 102486d..caec204 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -1,353 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index db64675..a3e5672 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/zsafe.ts b/i18n/xx/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/xx/zsafe.ts
+++ b/i18n/xx/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/bluepin.ts b/i18n/zh_CN/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/zh_CN/bluepin.ts
+++ b/i18n/zh_CN/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/bluetooth-manager.ts b/i18n/zh_CN/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/zh_CN/bluetooth-manager.ts
+++ b/i18n/zh_CN/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/calculator.ts b/i18n/zh_CN/calculator.ts
index d142fcc..db98fc2 100644
--- a/i18n/zh_CN/calculator.ts
+++ b/i18n/zh_CN/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/checkbook.ts b/i18n/zh_CN/checkbook.ts
index 2cdb02b..dafff9b 100644
--- a/i18n/zh_CN/checkbook.ts
+++ b/i18n/zh_CN/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index cb64e37..669dcab 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -144,680 +144,688 @@ Quit anyway?</source>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 8658bbc..c64ebf8 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/go.ts b/i18n/zh_CN/go.ts
index ef2a60d..e34ea4b 100644
--- a/i18n/zh_CN/go.ts
+++ b/i18n/zh_CN/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/gutenbrowser.ts b/i18n/zh_CN/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/zh_CN/gutenbrowser.ts
+++ b/i18n/zh_CN/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libaboutapplet.ts b/i18n/zh_CN/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/zh_CN/libaboutapplet.ts
+++ b/i18n/zh_CN/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libbatteryapplet.ts b/i18n/zh_CN/libbatteryapplet.ts
index aeb2c4a..b2e341e 100644
--- a/i18n/zh_CN/libbatteryapplet.ts
+++ b/i18n/zh_CN/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/zh_CN/libliquid.ts
+++ b/i18n/zh_CN/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libmemoryapplet.ts b/i18n/zh_CN/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/zh_CN/libmemoryapplet.ts
+++ b/i18n/zh_CN/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopiecore2.ts b/i18n/zh_CN/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/zh_CN/libopiecore2.ts
+++ b/i18n/zh_CN/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopieobex.ts b/i18n/zh_CN/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/zh_CN/libopieobex.ts
+++ b/i18n/zh_CN/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libscreenshotapplet.ts b/i18n/zh_CN/libscreenshotapplet.ts
index b882fb9..b32ed89 100644
--- a/i18n/zh_CN/libscreenshotapplet.ts
+++ b/i18n/zh_CN/libscreenshotapplet.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/zh_CN/libtodaydatebookplugin.ts
index 00283f7..2090513 100644
--- a/i18n/zh_CN/libtodaydatebookplugin.ts
+++ b/i18n/zh_CN/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/odict.ts b/i18n/zh_CN/odict.ts
index 88ebad1..a021376 100644
--- a/i18n/zh_CN/odict.ts
+++ b/i18n/zh_CN/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ase sensitive</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Search methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/opieirc.ts b/i18n/zh_CN/opieirc.ts
index fb55663..9e54837 100644
--- a/i18n/zh_CN/opieirc.ts
+++ b/i18n/zh_CN/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/zh_CN/sysinfo.ts
index 3528d42..c5017ae 100644
--- a/i18n/zh_CN/sysinfo.ts
+++ b/i18n/zh_CN/sysinfo.ts
@@ -1,353 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 60233b2..cf928b2 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -1,142 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</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>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to get to the config dialog</source>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/zsafe.ts b/i18n/zh_CN/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/zh_CN/zsafe.ts
+++ b/i18n/zh_CN/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/bluepin.ts b/i18n/zh_TW/bluepin.ts
index 616207e..d54095a 100644
--- a/i18n/zh_TW/bluepin.ts
+++ b/i18n/zh_TW/bluepin.ts
@@ -1,36 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>PinDlgBase</name>
     <message>
         <source>Please enter pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please enter PIN:</source>
+        <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save pin</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
+        <source>Enter PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</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>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Outgoing connection to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incoming connection from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/bluetooth-manager.ts b/i18n/zh_TW/bluetooth-manager.ts
index 6dd2c28..7dfe90b 100644
--- a/i18n/zh_TW/bluetooth-manager.ts
+++ b/i18n/zh_TW/bluetooth-manager.ts
@@ -1,334 +1,324 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BlueBase</name>
     <message>
         <source>Bluetooth Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Device name : &lt;/b&gt; Ipaq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC adress: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes were applied.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>rescan sevices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</source>
+        <source>Test1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>delete</source>
+        <source>no services found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Test1:</source>
+        <source>No connections found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>no services found</source>
+        <source>&amp;Rescan services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No connections found</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan for Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Passkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable authentification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>enable encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Page scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Inquiry scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rfcomm Bind Table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
-        <source>Form2</source>
+        <source>&amp;Rescan Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Devicename</source>
+        <source>&amp;Edit RFCOMM Bind Table</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeviceDialog</name>
     <message>
-        <source>Services</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>change settings</source>
+        <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>service name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change device 
-name</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default PIN 
-Code</source>
+        <source>TextLabel9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>&amp;Apply Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel9</source>
+        <source>Default PIN Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change device name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DunPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ObexDialog</name>
     <message>
         <source>beam files </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which file should be beamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieTooth::ScanDialog</name>
     <message>
         <source>Scan for devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop scan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPDialog</name>
     <message>
         <source>ppp connection </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter an ppp script name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PanPopup</name>
     <message>
         <source>connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connect+conf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>disconnect</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommAssignDialogBase</name>
     <message>
         <source>Rfcomm Bind</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bind device to a interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RfcommDialogItemBase</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mac</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</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>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 30c2559..9829d5c 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">計算機</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">標準</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&#xb0;F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index 4bf1fcb..53b29b9 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -1,631 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use smaller font for list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select smaller font for transactions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index aa3c197..bf2b2cb 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -140,687 +140,699 @@ Quit anyway?</translation>
         <source>Friday</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>天</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 下午</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 上午</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>下午</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>上午</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">行事曆</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>喜好選項</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished">:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished">分鐘</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">家</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pluginlist</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. 一月-00. 一月</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">紅外線</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>重覆...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>每日...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>每星期...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>每月...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>每年...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>開始時間</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>結束時間</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>新事件</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>地點</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>分類</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>約會</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>中餐</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>晚餐</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>旅行</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>家</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">開始時間</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>終日</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>時區</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;A鬧鐘</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>分鐘</translation>
+        <translation type="obsolete">分鐘</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>沉默</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>大聲</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>序述</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
+    <message>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished">日</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>編輯備忘錄</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>每 %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>每%1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>每%1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>每</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>星期一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>星期二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>星期三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>星期四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>星期五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>星期六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>星期天</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>不重覆</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>日(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>星期(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>月(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>年(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>日</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source> and </source>
         <translation>和</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, 和</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, 和</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>重覆事件</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>頻率</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>結束:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>無結束日期</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>月</translation>
     </message>
     <message>
         <source>years</source>
         <translation>年</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index ac499d9..22bc831 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -1,249 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>指令選擇</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>指令</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;指令&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;建議的指令&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>終端機</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>空白</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>上</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>下</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>貼上</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>顯示指令清單</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>隱藏指令清單</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>黑底綠字</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>白底黑字</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>黑底白字</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>黃底綠字</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>洋紅底藍字</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>藍底洋紅字</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>白底藍綠字</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>藍綠底白字</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>黑底藍字</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>黑底琥珀字</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>快速編輯</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>左</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>右</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>捲動軸</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>顯示指令清單</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>隱藏指令清單</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>自訂</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>指令清單</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>換行</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>使用嗶聲</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>指令選擇</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>加入指令</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>輸入要加入的指令:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/go.ts b/i18n/zh_TW/go.ts
index 48487d9..f582201 100644
--- a/i18n/zh_TW/go.ts
+++ b/i18n/zh_TW/go.ts
@@ -1,52 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>新遊戲</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Pass</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>放棄</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Two player 選項</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>白 %1,黑 %2</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>白方勝出.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>黑方勝出</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>A draw.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>I pass</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisoner: 黑 %1, 白 %2</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/gutenbrowser.ts b/i18n/zh_TW/gutenbrowser.ts
index 70a3769..b94c754 100644
--- a/i18n/zh_TW/gutenbrowser.ts
+++ b/i18n/zh_TW/gutenbrowser.ts
@@ -1,448 +1,447 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</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>Gutenbrowser</name>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last name first 
-(requires library restart)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Last name first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libaboutapplet.ts b/i18n/zh_TW/libaboutapplet.ts
index 77c88cd..e1041b1 100644
--- a/i18n/zh_TW/libaboutapplet.ts
+++ b/i18n/zh_TW/libaboutapplet.ts
@@ -1,75 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</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"></translation>
     </message>
     <message>
         <source>Authors</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>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Robert &apos;Sandman&apos; Griebl&lt;/b&gt; (sandman@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index eb39923..66ac1e3 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -1,86 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>充電中</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>電池狀態:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>良好</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>非常低</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>臨界的</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>使用備份電源</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>使用電源線</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>外部電源切斷</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remaing Power: %1 %2
-Remaining Time: %3</source>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  %1</source>
+        <source>Remaining Power: %1 
+%2
+Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index 2335328..9b4dece 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">透明</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">透明</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libmemoryapplet.ts b/i18n/zh_TW/libmemoryapplet.ts
index d3175f0..211eb0b 100644
--- a/i18n/zh_TW/libmemoryapplet.ts
+++ b/i18n/zh_TW/libmemoryapplet.ts
@@ -1,160 +1,164 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryStatus</name>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Swapfile</name>
     <message>
         <source>Swapfile location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RAM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> On </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> Off </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manage Swapfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to initialize swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed to remove swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile removed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swapfile activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Swap disabled in kernel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopiecore2.ts b/i18n/zh_TW/libopiecore2.ts
index 427ef9e..be1e337 100644
--- a/i18n/zh_TW/libopiecore2.ts
+++ b/i18n/zh_TW/libopiecore2.ts
@@ -1,96 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hinge3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rotate Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopieobex.ts b/i18n/zh_TW/libopieobex.ts
index 8fd774c..99678f4 100644
--- a/i18n/zh_TW/libopieobex.ts
+++ b/i18n/zh_TW/libopieobex.ts
@@ -1,76 +1,103 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IrDa is not enabled!</source>
+        <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for IrDa Devices.</source>
+        <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bluetooth is not available</source>
+        <source>ready.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching for bluetooth Devices.</source>
+        <source>error :(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scheduling for beam.</source>
+        <source>complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to beam</source>
+        <source>not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sent</source>
+        <source>searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>obexSendBase</name>
+    <message>
+        <source>Send via OBEX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Sending:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try %1</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search again for IrDa.</source>
+        <source>Receiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start sending</source>
+        <source>T</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rescan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libscreenshotapplet.ts b/i18n/zh_TW/libscreenshotapplet.ts
index 4e6aa6e..83cbb7b 100644
--- a/i18n/zh_TW/libscreenshotapplet.ts
+++ b/i18n/zh_TW/libscreenshotapplet.ts
@@ -1,57 +1,57 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
         <source>Name of screenshot </source>
-        <translation>檔案名稱</translation>
+        <translation type="obsolete">檔案名稱</translation>
     </message>
     <message>
         <source>Delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save named</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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/libtodaydatebookplugin.ts b/i18n/zh_TW/libtodaydatebookplugin.ts
index 30c2a58..d08976a 100644
--- a/i18n/zh_TW/libtodaydatebookplugin.ts
+++ b/i18n/zh_TW/libtodaydatebookplugin.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/odict.ts b/i18n/zh_TW/odict.ts
index d887ab1..99b124d 100644
--- a/i18n/zh_TW/odict.ts
+++ b/i18n/zh_TW/odict.ts
@@ -1,111 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieirc.ts b/i18n/zh_TW/opieirc.ts
index b23aa7d..507ee2b 100644
--- a/i18n/zh_TW/opieirc.ts
+++ b/i18n/zh_TW/opieirc.ts
@@ -1,719 +1,724 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DCCProgress</name>
     <message>
         <source>Receiving file %1 from %2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully received %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peer Aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Timeout</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DCCTransferTab</name>
     <message>
         <source>DCC Transfers in Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DCC Transfer from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is trying to send you the file %2
 (%3 bytes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</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>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Channel %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname 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>
+comma separated list of valid
+ channel names (starting 
+with one of &apos;#&apos; &apos;+&apos; &apos;&amp;&apos; &apos;!&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></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>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <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/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index 983bd63..1c59a28 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -1,357 +1,372 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">本圖表顯示CF記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">本圖表顯示硬碟上已使用的儲存空間</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">本圖表顯示SD記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">本圖表顯示內建記憶體中已使用的記憶體量</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">本圖表顯示RAM disk上已使用的記憶體量</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>應用程式CPU使用率 (%)</translation>
+        <translation type="obsolete">應用程式CPU使用率 (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>系統CPU使用率</translation>
+        <translation type="obsolete">系統CPU使用率</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>型號</translation>
+        <translation type="obsolete">型號</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation>本頁顯示處理器資源消耗程度</translation>
+        <translation type="obsolete">本頁顯示處理器資源消耗程度</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>緩衝區 (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>快取區 (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>剩餘 (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>從選單中選擇指令，再點右側的「送出」鈕即可送出命令給選取的模組</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>點下此處即可送出命令給上方已選取的模組</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>尚餘 (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 Kb</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui</name>
+    <message>
+        <source>My Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the devices currently recognized on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>命令</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>這是裝置上所有執行中程序的清單
 
 點住程序名稱不放即可顯示詳細資訊或送訊號給它</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>由選單中選擇一個訊號，並點下右側的「送出」鈕，即可送訊號給該程序</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>點此處以送出選定的訊號給選取的程序</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>本區顯示選取程序的詳細資料</translation>
     </message>
     <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>系統資訊</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>記憶體</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>儲存空間</translation>
     </message>
     <message>
         <source>CPU</source>
-        <translation>中央處理器</translation>
+        <translation type="obsolete">中央處理器</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>程序</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux 核心&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>編譯者：</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>建立日期</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>本頁顯示本裝置上執行的Opie, Linux核心版及發行套件名稱</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 59b9741..d520491 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,142 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">今日</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">所有人</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>請填入個人名片資料</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>plugins未啟動</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>按此處啟動聯結的應用程式</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation>Today By Maximilian Reiß</translation>
+        <translation type="obsolete">Today By Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>按此處啟動設定對話視窗</translation>
     </message>
+    <message>
+        <source>Today by Maximilian Rei&#xef;&#xbf;&#xbd;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>載入及順序設定</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>啟動/順序</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>勾選要啟動的plugins，並用右側的上下箭頭來調整顯示順序</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">打勾開啟喚醒時自動啟動「今日」功能</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">休眠分鐘數</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">設定圖示的像素點數</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">秒</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">永不</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">「今日」多久自動更新一次內容</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index 876279b..5dd2296 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,566 +1,598 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="obsolete">&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
-        <translation>Speichern mit neuem &amp;Passwort</translation>
+        <translation type="obsolete">Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
-        <translation>Textdatei &amp;Exportieren</translation>
+        <translation type="obsolete">Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
-        <translation>Textdatei &amp;Importieren</translation>
+        <translation type="obsolete">Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
-        <translation>Textdatei &amp;löschen</translation>
+        <translation type="obsolete">Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
-        <translation>&amp;Expandiert Öffnen</translation>
+        <translation type="obsolete">&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;Beenden</translation>
+        <translation type="obsolete">&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="obsolete">&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="obsolete">&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Ändern</translation>
+        <translation type="obsolete">&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
-        <translation>&amp;Kategorie</translation>
+        <translation type="obsolete">&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="obsolete">&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="obsolete">&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="obsolete">&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
-        <translation>&amp;Suchen</translation>
+        <translation type="obsolete">&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
-        <translation>&amp;Eintrag</translation>
+        <translation type="obsolete">&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation>&amp;Über</translation>
+        <translation type="obsolete">&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <translation type="obsolete">&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>&amp;New document</source>
-        <translation>&amp;Neue Datei</translation>
+        <translation type="obsolete">&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
-        <translation>&amp;Öffne Datei</translation>
+        <translation type="obsolete">&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
-        <translation>&amp;Speichere Datei als..</translation>
+        <translation type="obsolete">&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>New entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete category or entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save document with new Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open entries expanded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>