21 files changed, 322 insertions, 113 deletions
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,225 +1,215 @@
 <!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>
+        <source>Test1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to group</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 
+        <source>Information</source>
-name</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Default PIN 
+        <source>TextLabel9</source>
-Code</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>
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
@@ -116,124 +116,116 @@
    </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>
@@ -283,50 +275,58 @@
    <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
@@ -273,96 +273,104 @@ protected</source>
    <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.
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
@@ -487,118 +487,130 @@ Quit anyway?</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>
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
@@ -182,68 +182,72 @@
    <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
@@ -240,116 +240,115 @@ http://www.trolltech.com
        <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>
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
@@ -16,60 +16,61 @@
        <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
@@ -29,58 +29,59 @@
        <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
+        <source>Ipaq  %1</source>
-Remaining Time: %3</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,50 +1,57 @@
 <!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>
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
@@ -111,50 +111,54 @@ Memory is categorized as follows:
    <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
@@ -40,57 +40,61 @@
    <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
@@ -9,103 +9,111 @@
        <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
@@ -337,96 +337,100 @@ Real name: %4</source>
    <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>
@@ -437,98 +441,99 @@ Real name: %4</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
+comma separated list of valid
- names which start with either &apos;#&apos; or &apos;+&apos;</source>
+ 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>
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
@@ -68,109 +68,109 @@
        <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>
@@ -184,174 +184,189 @@ Memory is categorized as follows:
 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,94 +1,98 @@
 <!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>
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
@@ -163,169 +163,169 @@ shows the list of dirs and files</source>
    <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>
@@ -411,156 +411,188 @@ Bitte 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>