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,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
@@ -65,512 +65,520 @@
         <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>
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
@@ -279,534 +279,546 @@ Quit anyway?</source>
         <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>
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
@@ -32,417 +32,416 @@
 <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
@@ -129,591 +129,596 @@
 </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>