Gigantic result of make opie-lupdate

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

79 files changed, 4876 insertions, 501 deletions

diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index cc66814..f15c742 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation>Директориумот не постои</translation>
+        <translation type="obsolete">Директориумот не постои</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Менаџер на Датотеки 
+        <translation type="obsolete">Менаџер на Датотеки 
 copyright 2002-2003 од 
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
  и лиценциран под GPL лиценца</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Прикажи сокриени датотеки</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Промени директориум</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Изврши</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Отвори како текст</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
@@ -82,49 +82,49 @@ L.J.Potter&lt;llornkcor@handhelds.org&gt;
     <message>
         <source>File Info</source>
         <translation>Податоци за датотека</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Постави правила</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Пренеси датотека</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>Напреден Фајл Менаџер</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Неможе да се пренесе 
+        <translation type="obsolete">Неможе да се пренесе 
 тековниот директориум од листата на линкови
 Директорумот не е во листата на линкови!</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Датотека</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Преберување на датотеки</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Извеши команда со излезни податоци</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Избери се</translation>
     </message>
     <message>
@@ -142,177 +142,234 @@ It is not bookmarked!</source>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Отстрани го тековниот директориум од листа на линкови</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>Да избришам
+        <translation type="obsolete">Да избришам
 %1 датотеки?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Избриши директориум?</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Избриши %1
+        <translation type="obsolete">Избриши %1
 и неговата содржина?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Избриши 
+        <translation type="obsolete">Избриши 
 %1?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation>Копирај 
+        <translation type="obsolete">Копирај 
 %1 датотеки?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Датотеката постои!</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 посоти. Да ја препишам?</translation>
+        <translation type="obsolete">%1 посоти. Да ја препишам?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Неможе да се копира %1 во %2</translation>
+        <translation type="obsolete">Неможе да се копира %1 во %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation>
+        <translation type="obsolete">
 посоти. Да ја препишам?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Неможе да се копиа
+        <translation type="obsolete">Неможе да се копиа
 </translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation>во</translation>
+        <translation type="obsolete">во</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished">Копирај</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Како</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation>веќе постои.Да ја избришам?</translation>
+        <translation type="obsolete">веќе постои.Да ја избришам?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation>Не може да се премести</translation>
+        <translation type="obsolete">Не може да се премести</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Испис на Напреден Фајл менаџер</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Пренос од Напреден Фајл Менаџер</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>пратено.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
+        <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy %1 As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Сними го излезот во датотека (само име)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 3057bb8..6ed45a8 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -1,30 +1,30 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Бекап и Обновување...работи...</translation>
+        <translation type="obsolete">Бекап и Обновување...работи...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
@@ -33,100 +33,124 @@
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Backing up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Backup...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Бекап</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Апликации</translation>
     </message>
     <message>
         <source>Save To</source>
-        <translation>Сними во</translation>
+        <translation type="obsolete">Сними во</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Бекап</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Обновување</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Избери извор</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Колона 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Обновување</translation>
     </message>
     <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Data (Configuration + PIM)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Backup (Root File System)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/bartender.ts b/i18n/mk/bartender.ts
index c5c572b..67a61fd 100644
--- a/i18n/mk/bartender.ts
+++ b/i18n/mk/bartender.ts
@@ -68,102 +68,107 @@
 </context>
 <context>
     <name>Bartender</name>
     <message>
         <source>Bartender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of Drink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drink database not opened sucessfully.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alcohol</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Sorry no results for
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sorry no results for
+        <source>Find by Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Drink</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write to drink database!
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Ingredient</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>New_Drink</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ingredients</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Show_Drink</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/bluetooth-manager.ts b/i18n/mk/bluetooth-manager.ts
index 85df85c..6dd2c28 100644
--- a/i18n/mk/bluetooth-manager.ts
+++ b/i18n/mk/bluetooth-manager.ts
@@ -68,87 +68,87 @@
         <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>Bluetooh Basic 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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Devicename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>change settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/dagger.ts b/i18n/mk/dagger.ts
index c9db0e1..e8232ae 100644
--- a/i18n/mk/dagger.ts
+++ b/i18n/mk/dagger.ts
@@ -143,48 +143,56 @@
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Navigation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Morphological Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Morphological tag cross-referencing not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll backward one page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous verse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to scroll backward one verse.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter location to display here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 98a0e01..1a70175 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -155,48 +155,56 @@
     <message>
         <source>Select...</source>
         <translation>Избери...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Големина:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мало</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Големо</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Боја:</translation>
     </message>
+    <message>
+        <source>Columns:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Јазичиња на главно мени:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>панел</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
diff --git a/i18n/mk/libGPRS.ts b/i18n/mk/libGPRS.ts
new file mode 100644
index 0000000..85f8296
--- a/dev/null
+++ b/i18n/mk/libGPRS.ts
@@ -0,0 +1,99 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GPRSEdit</name>
+    <message>
+        <source>APN is required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSGUI</name>
+    <message>
+        <source>GPRS Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>As assigned by server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set as default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set even if Set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed Routing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Net</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GPRSNetNode</name>
+    <message>
+        <source>GPRS capable device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;provides access to a GPRS capable device.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 7c1517c..f6e6187 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -1,74 +1,74 @@
 <!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>AboutDialog</name>
+    <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
+&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
+&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
+&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
+&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index f6c7c2f..699b5b9 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -6,92 +6,105 @@
         <translation type="obsolete">Состојба на батерија</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="obsolete">Затвори</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>неможе да се отвори датотека</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Полнење на двата уреда</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Полнење</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Проценти на остнато напојување</translation>
+        <translation type="obsolete">Проценти на остнато напојување</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Состојба на батерија:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Добро</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Ниско</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>На помошно напојување</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Вклучено напојување</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Иклучено надворешно напојување</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Останато време</translation>
+        <translation type="obsolete">Останато време</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Проценти на остнато напојување:</translation>
+        <translation type="obsolete">Проценти на остнато напојување:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Останато време:</translation>
+        <translation type="obsolete">Останато време:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ipaq  </source>
+        <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jacket  </source>
+        <source>Remaining Power: %1%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remaining Time: %1m %2s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remaing Power: %1 %2
+Remaining Time: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libbluetooth.ts b/i18n/mk/libbluetooth.ts
index 9247272..b61aee3 100644
--- a/i18n/mk/libbluetooth.ts
+++ b/i18n/mk/libbluetooth.ts
@@ -30,48 +30,63 @@
     </message>
 </context>
 <context>
     <name>BluetoothBNEPNetNode</name>
     <message>
         <source>Bluetooth PAN/NAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth Network profile.&lt;/p&gt;&lt;p&gt;Use this to connect two computing devices.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothRFCOMMGUI</name>
     <message>
         <source>Bluetooth-rfcomm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
+        <source>Selected devices with gprs capability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start automatically</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm before start</source>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addresses</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BluetoothRFCOMMNetNode</name>
     <message>
         <source>Bluetooth serial link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a bluetooth link using the bluetooth serial profile.&lt;/p&gt;&lt;p&gt;Use this to connect to a GSM.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BluetoothRFCOMMRun</name>
+    <message>
+        <source>Select device to connect to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libbrightnessapplet.ts b/i18n/mk/libbrightnessapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libbrightnessapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libcable.ts b/i18n/mk/libcable.ts
index e561d56..1567c52 100644
--- a/i18n/mk/libcable.ts
+++ b/i18n/mk/libcable.ts
@@ -135,33 +135,33 @@
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
+        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
+        <source>Cable connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libcardmonapplet.ts b/i18n/mk/libcardmonapplet.ts
index 81f491d..62f10de 100644
--- a/i18n/mk/libcardmonapplet.ts
+++ b/i18n/mk/libcardmonapplet.ts
@@ -8,26 +8,34 @@
     <message>
         <source>Eject card 0: %1</source>
         <translation>Исфрли картичка 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Исфрли картичка 1: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Грешка при исфрлањето на CF/PCMCIA картичката!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>грешка при исфрлање на SD/MMC картичка!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Нова картичка:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Исфрлена:</translation>
     </message>
+    <message>
+        <source>New card: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: SD/MMC</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libexample_applet.ts b/i18n/mk/libexample_applet.ts
new file mode 100644
index 0000000..7a58987
--- a/dev/null
+++ b/i18n/mk/libexample_applet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MenuAppletExample</name>
+    <message>
+        <source>MenuApplet Example Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No white rabbit found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No white rabbit was seen near Opie.Only the beautiful OpieZilla is availablefor your pleassure&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libexample_board.ts b/i18n/mk/libexample_board.ts
new file mode 100644
index 0000000..f4cfa45
--- a/dev/null
+++ b/i18n/mk/libexample_board.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExampleBoard</name>
+    <message>
+        <source>Alt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ctrl</source>
+        <comment>Control Shortcut on keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example Input</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libexample_vpn.ts b/i18n/mk/libexample_vpn.ts
new file mode 100644
index 0000000..7731bc4
--- a/dev/null
+++ b/i18n/mk/libexample_vpn.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>VPN PPTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add new Point to Point Tunnel Protocol connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libinterfaces.ts b/i18n/mk/libinterfaces.ts
index 3e43c25..9d04b39 100644
--- a/i18n/mk/libinterfaces.ts
+++ b/i18n/mk/libinterfaces.ts
@@ -1,26 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Interface</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation type="unfinished">Рестартирање на интерфејс</translation>
+    </message>
+</context>
+<context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Напредни информации за интерфејс</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP Адреса</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>интерфејс</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnet Маска</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
diff --git a/i18n/mk/libkppp.ts b/i18n/mk/libkppp.ts
index b184b3f..79213ec 100644
--- a/i18n/mk/libkppp.ts
+++ b/i18n/mk/libkppp.ts
@@ -314,48 +314,52 @@ the device &quot;%1&quot;?</source>
         <source>Allows you to modify the selected device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Deletes the selected device
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/liblancard.ts b/i18n/mk/liblancard.ts
index d250d5e..c3668d7 100644
--- a/i18n/mk/liblancard.ts
+++ b/i18n/mk/liblancard.ts
@@ -16,25 +16,32 @@
     <message>
         <source>MACAddress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanCardNetNode</name>
     <message>
         <source>LAN card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Sets up a wired regular LAN card.&lt;/p&gt;&lt;p&gt;Use this to set up 10/100/1000 MBit LAN cards.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LanCardRun</name>
+    <message>
+        <source>No interface found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/liblockapplet.ts b/i18n/mk/liblockapplet.ts
new file mode 100644
index 0000000..8c12ea1
--- a/dev/null
+++ b/i18n/mk/liblockapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LockMenuApplet</name>
+    <message>
+        <source>Lock shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libmailwrapper.ts b/i18n/mk/libmailwrapper.ts
index 0084dfc..8408728 100644
--- a/i18n/mk/libmailwrapper.ts
+++ b/i18n/mk/libmailwrapper.ts
@@ -132,48 +132,65 @@
     </message>
 </context>
 <context>
     <name>POP3wrapper</name>
     <message>
         <source>Mailbox contains %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Download mail?
+It is %1 kByte but your limit is %2 kByte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/libmemoryapplet.ts b/i18n/mk/libmemoryapplet.ts
index 13b9d22..d3175f0 100644
--- a/i18n/mk/libmemoryapplet.ts
+++ b/i18n/mk/libmemoryapplet.ts
@@ -96,65 +96,65 @@ Memory is categorized as follows:
         <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>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 </context>
 </TS>
diff --git a/i18n/mk/libnetworksettings2.ts b/i18n/mk/libnetworksettings2.ts
index 72ddc06..27df2e7 100644
--- a/i18n/mk/libnetworksettings2.ts
+++ b/i18n/mk/libnetworksettings2.ts
@@ -1,71 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>System</name>
     <message>
         <source>Command : </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>State should be off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State should at least be off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TheNSResources</name>
     <message>
         <source>Network Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle IP packets&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle single bytes&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
+        <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to GPRS device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Connection to a GPRS capable device&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
+        <source>Today Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>networksettings2</name>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available</source>
+        <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IsUp</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiemm2.ts b/i18n/mk/libopiemm2.ts
index 4eb9e18..5b644e7 100644
--- a/i18n/mk/libopiemm2.ts
+++ b/i18n/mk/libopiemm2.ts
@@ -1,2 +1,155 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Colormode: Color
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colormode: Black and white
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daylight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorescent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard light C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D55</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D65</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D75</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White Balance: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center weighted average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MultiSpot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Metering Mode: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal progam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aperture priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutter priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creative progam
+(biased toward fast shutter speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action progam
+(biased toward fast shutter speed)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait mode
+(for closeup photos with the background out of focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape mode
+(for landscape photos with the background in focus)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exposure Program: %1
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index 27ff458..496d604 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -540,48 +540,151 @@ and </source>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Одбери Време:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::OPimMainWindow</name>
+    <message>
+        <source>Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view items belonging to %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view all unfiled items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to edit the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to duplicate the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to delete the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to transmit the selected item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to search for an item.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set your preferences for this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to filter the items displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current filter settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Сними</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Стил</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
@@ -983,45 +1086,73 @@ and </source>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Has a due-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No due-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No reccurrence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No start-date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No completed-date</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiesecurity2.ts b/i18n/mk/libopiesecurity2.ts
index c711687..2366b19 100644
--- a/i18n/mk/libopiesecurity2.ts
+++ b/i18n/mk/libopiesecurity2.ts
@@ -1,40 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
+        <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Launching authentication plugins...</source>
+        <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proceed...</source>
+        <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Congratulations! Your authentication has been successful.</source>
+        <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
+        <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
+        <source>Be careful: if this was not a &lt;b&gt;simulation&lt;/b&gt;, you would have to go back through all the steps now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopietooth2.ts b/i18n/mk/libopietooth2.ts
new file mode 100644
index 0000000..8118441
--- a/dev/null
+++ b/i18n/mk/libopietooth2.ts
@@ -0,0 +1,439 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OTDevice</name>
+    <message>
+        <source>Could not start hciattach</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not stop process</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTDriver</name>
+    <message>
+        <source>Can&apos;t open device %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read local name on %1. %2 : %3.  Default to %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read revision info on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset failed for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 up. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bring interface %1 down. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t set scan mode on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change local name on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change authentication on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change encryption on %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change class informations for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t read class information for %1. %2 : %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid Device Class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTGateway</name>
+    <message>
+        <source>error opening hci socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTGateway error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read error in link key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open temporary link_key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get NetworkSetup list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t open RFCOMM control socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t get device list</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTHCISocket</name>
+    <message>
+        <source>Error creating socket on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error binding to socket to %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI filter setup failed on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HCI socket error 0x%1 on %1 : %2 %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTInquiry</name>
+    <message>
+        <source>Timeout while waiting for end of inquiry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OTInquiry completed with error (code %1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMain</name>
+    <message>
+        <source>Manage local devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTMainGUI</name>
+    <message>
+        <source>Bluetooth Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage your local Bluetooth hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use device :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>San the bluetooth network neighbourhood using the selected local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage device pairings to or from the local device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sniff the bluetooth network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManage</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Service classes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device class</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTManageGUI</name>
+    <message>
+        <source>Manage local  devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Is Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairing</name>
+    <message>
+        <source>Break pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sure ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, break</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, don&apos;t break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTPairingGUI</name>
+    <message>
+        <source>Manage pairing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable Bluetooth to break pairings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Break</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScan</name>
+    <message>
+        <source>Paired</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bluetooth not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTScanGUI</name>
+    <message>
+        <source>Scanning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cleanup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GroupBox1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal strength</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffGUI</name>
+    <message>
+        <source>Bluetooth Sniffing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hex</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascii</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear log</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTSniffing</name>
+    <message>
+        <source>Run hcidump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopietooth2applet.ts b/i18n/mk/libopietooth2applet.ts
new file mode 100644
index 0000000..56cd033
--- a/dev/null
+++ b/i18n/mk/libopietooth2applet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Opietooth2::Opietooth2Applet</name>
+    <message>
+        <source>Disable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index 9bb42d0..23f5c13 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -59,117 +59,113 @@
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished">Диалог на датотеки</translation>
+        <translation type="obsolete">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished">Отвори</translation>
+        <translation type="obsolete">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Сними</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Сними</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Име:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Голем</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Среден</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Мал</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Стил</translation>
+        <translation type="obsolete">Стил</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished">Големина</translation>
+        <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</translation>
+        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Име</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
@@ -392,79 +388,83 @@ and </source>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">Диалог на датотеки</translation>
+        <translation type="unfinished">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Отвори</translation>
+        <translation type="unfinished">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Сними</translation>
+        <translation type="unfinished">Сними</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Стил</translation>
+        <translation type="unfinished">Стил</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Големина</translation>
+        <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
+        <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/mk/libphasestyle.ts b/i18n/mk/libphasestyle.ts
new file mode 100644
index 0000000..8f00329
--- a/dev/null
+++ b/i18n/mk/libphasestyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PhaseStyle</name>
+    <message>
+        <source>Phase</source>
+        <comment>Name of the style Phase</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libppp.ts b/i18n/mk/libppp.ts
index 72e5ddc..92bcdc8 100644
--- a/i18n/mk/libppp.ts
+++ b/i18n/mk/libppp.ts
@@ -103,116 +103,189 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DomainName</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PPPGUI</name>
+    <name>PPPDialingGUI</name>
     <message>
-        <source>PPP</source>
+        <source>PPPDialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP settings</source>
+        <source>GPRS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DNS Settings</source>
+        <source>APN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>PPPIPEdit</name>
+    <name>PPPGUI</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>IPAddress needed</source>
+        <source>IP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IPAddress not valid</source>
+        <source>DNS Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask needed</source>
+        <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnet mask not valid</source>
+        <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PPPIPEdit</name>
     <message>
         <source>Gateway address needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway address not valid</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPIPGUI</name>
     <message>
         <source>PPPIP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set as default</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Overrules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only if not yet set</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PPPNetNode</name>
     <message>
-        <source>PPP Connection</source>
+        <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
+        <source>PPP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPRunGUI</name>
+    <message>
+        <source>PPPRun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>After</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;UL&gt;
+&lt;LI&gt;Commands run under your &lt;b&gt;real&lt;/b&gt; user id (&lt;b&gt;not&lt;/b&gt; as root)&lt;/LI&gt;
+&lt;LI&gt;Supply the whole path&lt;/LI&gt;
+&lt;/UL&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libprofile.ts b/i18n/mk/libprofile.ts
index 296dbb9..4bec219 100644
--- a/i18n/mk/libprofile.ts
+++ b/i18n/mk/libprofile.ts
@@ -1,52 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ProfileGUI</name>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Multicast, Up)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,52 +85,68 @@
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Traffic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dropped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bytes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transmitting</source>
+        <source>Collisions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Others</source>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Collisions</source>
+        <source>Pkt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>ODO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Miscellaneous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset ODO</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileNetNode</name>
     <message>
         <source>Regular connection profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Define use of an IP connection.&lt;/p&gt;&lt;p&gt;Configure if and when this connection needs to be established&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libqpickboard.ts b/i18n/mk/libqpickboard.ts
index 2cc9f99..2c92dad 100644
--- a/i18n/mk/libqpickboard.ts
+++ b/i18n/mk/libqpickboard.ts
@@ -1,9 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DictFilterConfig</name>
+    <message>
+        <source>Adding Words</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To add words, pick the letters,
+then open the Add dialog. In that
+dialog, tap the correct letters
+from the list (tap twice for
+capitals).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
         <translation>Избирачка тастатура</translation>
     </message>
 </context>
+<context>
+    <name>PickboardAdd</name>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardConfig</name>
+    <message>
+        <source>&lt;h1&gt;The Pickboard&lt;/h1&gt;&lt;i&gt;The smallest and fastest way to type.&lt;/i&gt;&lt;p&gt;Enter a word by tapping letter-groups and picking the word.&lt;br&gt;Enter spaces with &quot;Space&quot;, or other keys through &quot;KEY&quot;.&lt;br&gt;Use &quot;Shift&quot; to capitalize words that are not normally capitalized.&lt;br&gt;Press &quot;Shift&quot; twice for an all-capitals word.&lt;br&gt;Add custom words by picking them, then selecting &quot;Add...&quot; from the menu on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pickboard Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PickboardPicks</name>
+    <message>
+        <source>Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC DEF GHI JKL MNO PQR STU VWX YZ-&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABC&#xc0;&#xc1;&#xc2;&#xc3;&#xc4;&#xc5;&#xc6;&#xc7; DEF&#xd0;&#xc8;&#xc9;&#xca;&#xcb; GHI&#xcc;&#xcd;&#xce;&#xcf; JKL MNO&#xd1;&#xd2;&#xd3;&#xd4;&#xd5;&#xd6;&#xd8; PQR&#xde; STU&#xdf;&#xd9;&#xda;&#xdb;&#xdc; VWX YZ-&apos;&#xdd;&#xff;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KEY</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libscreenshotapplet.ts b/i18n/mk/libscreenshotapplet.ts
index b135d74..6c0e95b 100644
--- a/i18n/mk/libscreenshotapplet.ts
+++ b/i18n/mk/libscreenshotapplet.ts
@@ -24,26 +24,34 @@
     <message>
         <source>Scap</source>
         <translation>Намали</translation>
     </message>
     <message>
         <source>Name of screenshot </source>
         <translation>Име на слика</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Успех</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
         <translation>Сликата е снимена на %1</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
         <translation>Поврзувањето со %1 неуспеа.</translation>
     </message>
+    <message>
+        <source>Opie drawpad</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please set &lt;b&gt;QWS_DISPLAY&lt;/b&gt; environmental variable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
index 482e046..79965f2 100644
--- a/i18n/mk/libtodayaddressbookplugin.ts
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Максимален бр. на линии:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Подесете го максималниот бр. на линии кои ќе се покажуваат за секоја годишнина/роденден</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation>Скрати линија по Х карактери:</translation>
+        <translation type="obsolete">Скрати линија по Х карактери:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>После колку карактери информацијата за настанот би требало да биде скратена</translation>
+        <translation type="obsolete">После колку карактери информацијата за настанот би требало да биде скратена</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Денови за гледање напред:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Колку денови напред во месецот треба да се изврши пребарување</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished">За да се активираат промените: Рестартирај ја апликацијата!</translation>
+        <translation type="obsolete">За да се активираат промените: Рестартирај ја апликацијата!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Намести боја на наслов:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Бои за насловите!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Намести боја за настан:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Оваа боја ке се користи за да ги прикажува родендените/годишнините!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Намести боја за 
 итно ако е под</translation>
     </message>
     <message>
diff --git a/i18n/mk/libtodayexampleplugin.ts b/i18n/mk/libtodayexampleplugin.ts
new file mode 100644
index 0000000..e7e0c6c
--- a/dev/null
+++ b/i18n/mk/libtodayexampleplugin.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ExamplePluginWidget</name>
+    <message>
+        <source>Example text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Example plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodayweatherplugin.ts b/i18n/mk/libtodayweatherplugin.ts
index 0840f64..e5d4455 100644
--- a/i18n/mk/libtodayweatherplugin.ts
+++ b/i18n/mk/libtodayweatherplugin.ts
@@ -86,32 +86,36 @@ Pres: </source>
         <translation>З</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>ЈЗ</translation>
     </message>
     <message>
         <source>S </source>
         <translation>Ј</translation>
     </message>
     <message>
         <source>SE </source>
         <translation>ЈИ</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>Км/Ч</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>М/ч</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation>хПа</translation>
+        <translation type="obsolete">хПа</translation>
     </message>
     <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
+    <message>
+        <source> kPa</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libvolumeapplet2.ts b/i18n/mk/libvolumeapplet2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libvolumeapplet2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libvpn.ts b/i18n/mk/libvpn.ts
index f8b06be..3f9a203 100644
--- a/i18n/mk/libvpn.ts
+++ b/i18n/mk/libvpn.ts
@@ -4,33 +4,33 @@
     <message>
         <source>VPN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm before start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
+        <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
+        <source>VPN connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libwebstyle.ts b/i18n/mk/libwebstyle.ts
new file mode 100644
index 0000000..018da10
--- a/dev/null
+++ b/i18n/mk/libwebstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WebStyle</name>
+    <message>
+        <source>Web</source>
+        <comment>Name of the style Web</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index c1f7877..d7985ab 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,29 +1,26 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
@@ -81,54 +78,48 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>WLanGUI</name>
-</context>
-<context>
-    <name>WLanNetNode</name>
-</context>
-<context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Station</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/mk/main-tab.ts b/i18n/mk/main-tab.ts
new file mode 100644
index 0000000..e4938d9
--- a/dev/null
+++ b/i18n/mk/main-tab.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Simple2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple1</name>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple2</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/multiauth.ts b/i18n/mk/multiauth.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/multiauth.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/networksettings2.ts b/i18n/mk/networksettings2.ts
new file mode 100644
index 0000000..cca8c0d
--- a/dev/null
+++ b/i18n/mk/networksettings2.ts
@@ -0,0 +1,232 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ActivateProfileGUI</name>
+    <message>
+        <source>Activate Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select profile to activate for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TextLabel2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ActivateVPNGUI</name>
+    <message>
+        <source>Activate VPN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check the VPN&apos;s you want to activate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetup</name>
+    <message>
+        <source>Error presentig NetworkSetup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Old NetworkSetup or missing plugin &quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Missing NetworkSetup&quot;&lt;i&gt;%1&lt;/i&gt;&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing NetworkSetup Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Definition not complete or no name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No configuration required</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditNetworkSetupGUI</name>
+    <message>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device Tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NetworkSetup profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto collapse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettings</name>
+    <message>
+        <source>Saving setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove selected profile ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In System Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name %1 already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;&lt;No description&gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activating profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease availability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not save setup to &quot;%1&quot; !&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot build proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot create path &quot;%1&quot; for proper file &quot;%2&quot; for node &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open proper file &quot;%1&quot; for node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;preamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section for node &quot;%1&quot; for proper file &quot;%2&quot; and node class &quot;%3&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;postamble&quot; for proper file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Cannot open system file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Preamble&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Pre-Device&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Common&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Pre-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Node&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in &quot;Post-Node Part&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Post-Device&quot; for file &quot;%1&quot; and node &quot;%2&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Error in section &quot;Closure&quot; for file &quot;%1&quot;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NetworkSettingsGUI</name>
+    <message>
+        <source>Network Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-console.ts b/i18n/mk/opie-console.ts
index 33bfa8f..000781a 100644
--- a/i18n/mk/opie-console.ts
+++ b/i18n/mk/opie-console.ts
@@ -243,48 +243,70 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Q Keycode</source>
+        <comment>Qt Key Code for the OnScreen Keyboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode Value</source>
+        <comment>The Unicode value of the key</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -334,48 +356,60 @@
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>4800 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -467,48 +501,60 @@
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
@@ -724,122 +770,110 @@
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Dialing the number failed.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixing up Embedix</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/opie-eye.ts b/i18n/mk/opie-eye.ts
index d7da0ae..1fb34c5 100644
--- a/i18n/mk/opie-eye.ts
+++ b/i18n/mk/opie-eye.ts
@@ -1,72 +1,288 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>BaseSetup</name>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slideshow timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size of thumbnails:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show toolbar on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save status of fullscreen/autorotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageView</name>
+    <message>
+        <source>View Image Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle autorotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle autoscale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to next image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to previous image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle thumbnail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>the Image %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
+        <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browser Keyboard Actions</source>
+        <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard Configuration</source>
+        <source>Opie Eye - Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Imageinfo Keyboard Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Imageview Keyboard Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go dir up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and Imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show images fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto rotate images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show images unscaled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show zoomer window when unscaled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select filesystem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
+        <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show all files</source>
+        <source>Opie Eye</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocView</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Directory View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show files recursive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recursion depth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Digital Camera View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error no Camera Dir found</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ViewModeButton</name>
+    <message>
+        <source>Thumbnail and Imageinfo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail and Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>imageinfo</name>
+    <message>
+        <source>View Full Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DirView</source>
+        <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opie-eye_slave.ts b/i18n/mk/opie-eye_slave.ts
index 83c1aef..62f159c 100644
--- a/i18n/mk/opie-eye_slave.ts
+++ b/i18n/mk/opie-eye_slave.ts
@@ -123,247 +123,125 @@
         <source>Depth: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ColorMode: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compression: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Color
+        <source>Date/Time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colormode: Black and white
+        <source>&lt;qt&gt;Comment: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quality: %1
+        <source>Manufacturer: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Daylight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White Balance: %1
+        <source>Model: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
+        <source>Orientation: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not defined</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
+        <source>Flash used
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date/Time: %1
+        <source>Focal length: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;Comment: %1
+        <source>35mm equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manufacturer: %1
-</source>
+        <source>CCD width: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Model: %1
+        <source>Exposure time: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Orientation: %1
+        <source>Aperture: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Flash used
+        <source>Distance: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Focal length: %1
-</source>
+        <source>Infinite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>35mm equivalent: %1
+        <source>ISO equivalent: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CCD width: %1</source>
+        <source>EXIF comment: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Exposure time: %1
-</source>
+        <source>&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Aperture: %1
+        <source>Dimensions: %1 x %2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distance: %1
+        <source>Size: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infinite</source>
+        <source>Compressed size: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO equivalent: %1
+        <source>used colors: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EXIF comment: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;/qt&gt;</source>
+        <source>Resolution: %1 x %2
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opie-login.ts b/i18n/mk/opie-login.ts
index fc7fcc6..93d5d9a 100644
--- a/i18n/mk/opie-login.ts
+++ b/i18n/mk/opie-login.ts
@@ -1,36 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притиснете на крстовите цврсто и 
 прецизно за да го калибрирате екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добредојдовте во Opie</translation>
+        <translation type="obsolete">Добредојдовте во Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Логирај се</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Добредојдовре во OPIE &lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>КОрисник</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Лозинка</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Суспензирај</translation>
     </message>
@@ -72,30 +72,73 @@ by an uncaught signal
     </message>
     <message>
         <source>Failure</source>
         <translation>Неуспех</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Неможе да се стартува OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Неможе да се префрли на нов идентитет на корисник</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PasswordDialog</name>
+    <message>
+        <source>Set Password</source>
+        <comment>Caption of the password dialog</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Password:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PasswordDialogImpl</name>
+    <message>
+        <source>Trying to leave without password set</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords don&apos;t match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password not legal</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opie-sheet.ts b/i18n/mk/opie-sheet.ts
new file mode 100644
index 0000000..bccc0e7
--- a/dev/null
+++ b/i18n/mk/opie-sheet.ts
@@ -0,0 +1,1027 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inconsistency error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File cannot be saved!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File cannot be opened!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid file format!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save the current file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UnnamedFile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import Excel file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import E&amp;xcel file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cell Selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cell &amp;Selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Contents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste Cont&amp;ents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;lear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Sheets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Row Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>H&amp;eight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Adjust</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Column Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adjust Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Column</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>R&amp;emove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Equal To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Equal To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Addition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subtraction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Subtraction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiplication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Multiplication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Division</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Division</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Open Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close Paranthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Comma</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colum&amp;n</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Simple</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ABS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CEILING(x,acc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FACT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FLOOR(x,acc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>INT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MOD(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ROUND(x,digits)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SIGN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EXP(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOG(x,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOG10(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POWER(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQRT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DEGREES(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RADIANS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PI()</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAND()</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RANDBETWEEN(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>S&amp;tandard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AND(x1,x2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NOT(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OR(x1,x2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IF(compare,val1,val2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>INDEX(range,index)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISBLANK(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISNUMBER(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EVEN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISEVEN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ODD(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ISODD(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logical-&amp;Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SIN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TAN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ASIN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ACOS(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATAN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATAN2(x,y)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SINH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COSH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TANH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ACOSH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ASINH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATANH(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Trigonometric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LEN(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LEFT(s,num)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RIGHT(s,num)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MID(s,pos,len)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CONCATENATE(s1,s2..)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EXACT(s1,s2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FIND(what,where,pos)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>REPLACE(s,pos,len,ns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>REPT(s,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UPPER(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LOWER(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Strings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AVERAGE(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COUNT(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>COUNTIF(range,eqls)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAX(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MIN(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SUM(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SUMSQ(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VAR(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VARP(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>STDEV(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>STDEVP(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SKEW(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KURT(range)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sta&amp;tistical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELI(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELJ(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELK(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BESSELY(x,n)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BETAI(x,a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERF(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERFC(a,b)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMALN(x)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMAP(x,a)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMAQ(x,a)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scienti&amp;fic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BETADIST(z,a,b,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHI2DIST(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHIDIST(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FDIST(z,deg1,deg2,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAMMADIST(x,a,b,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NORMALDIST(x,m,s,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PHI(x,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POISSON(x,n,Q?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Distributions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About Opie Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of rows:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of columns:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Number of sheets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sheet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Height of each row:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Width of each column:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sheet Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is only one sheet!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entire ro&amp;w</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entire &amp;column</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Sheet</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-update-symlinks.ts b/i18n/mk/opie-update-symlinks.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/opie-update-symlinks.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
index 04e0e56..ad2176c 100644
--- a/i18n/mk/opieirc.ts
+++ b/i18n/mk/opieirc.ts
@@ -1,138 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>IRCHistoryLineEdit</name>
+    <message>
+        <source>Next Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</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>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
@@ -187,57 +190,146 @@
         <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>You are now known as %1</source>
+        <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 is now known as %2</source>
+        <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 has quit (%2)</source>
+        <source>There are %1 operators connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are %1 unknown connection(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are %1 channels formed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait a while and try again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whois %1 (%2@%3)
+Real name: %4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is using server %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is on channels: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Names for %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time on server %1 is %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel or nick %1 doesn&apos;t exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is no history information for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t change nick to %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not on channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has been idle for %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 signed on %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with unknown person - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with unknown channel - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP PING with bad recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP VERSION request from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Malformed DCC request from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
@@ -293,117 +385,124 @@
         <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>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <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>Connection to</source>
+        <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server messages</source>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <source>Connecting to</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSession</name>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
@@ -443,72 +542,107 @@ comma separated list of channel
     <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/opiemail.ts b/i18n/mk/opiemail.ts
index 242ccfc..99637a7 100644
--- a/i18n/mk/opiemail.ts
+++ b/i18n/mk/opiemail.ts
@@ -58,71 +58,71 @@
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No Receiver specified</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -339,59 +339,59 @@
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter a filter string here.
-Then hit &quot;get newsgroup list&quot; again and only groups starting 
-with that filter will be listet.</source>
+        <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get newsgroup list from server</source>
+        <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Retrieve the list of groups from server</source>
+        <source>Enter a filter string here.
+Then hit &quot;get newsgroup list&quot; again and only groups starting 
+with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
@@ -508,48 +508,60 @@ with that filter will be listet.</source>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ask before downloading large mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large mail size (kb):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -695,91 +707,95 @@ with that filter will be listet.</source>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>E-Mail view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
diff --git a/i18n/mk/opieplayer2.ts b/i18n/mk/opieplayer2.ts
new file mode 100644
index 0000000..318cc5c
--- a/dev/null
+++ b/i18n/mk/opieplayer2.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Lib</name>
+    <message>
+        <source>Progress: %1 %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediaPlayer</name>
+    <message>
+        <source>OpiePlayer: Initializating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListFileView</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>Loading of Skin started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add  URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add File to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Files from Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opieplayer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Opieplayer2 skin not found!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please install an opieplayer2 skin package.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidgetGui</name>
+    <message>
+        <source>Play Operations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gamma (Video)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SkinLoader</name>
+    <message>
+        <source>Loading of Skin finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VideoWidget</name>
+    <message>
+        <source>OpiePlayer - Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>XineControl</name>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error on file &apos;%1&apos; with reason: </source>
+        <comment>Error when playing a file</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No input plugin found for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;No demux plugin found for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Demuxing failed for this media type&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Malformed MRL&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Input failed&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Some other error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opierec.ts b/i18n/mk/opierec.ts
index 652294f..b7d47ec 100644
--- a/i18n/mk/opierec.ts
+++ b/i18n/mk/opierec.ts
@@ -58,52 +58,48 @@
     </message>
     <message>
         <source>Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
 the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,57 +120,45 @@ the selected file?</source>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto Mute</source>
+        <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
+        <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opimconverter.ts b/i18n/mk/opimconverter.ts
new file mode 100644
index 0000000..e69a4f4
--- a/dev/null
+++ b/i18n/mk/opimconverter.ts
@@ -0,0 +1,120 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Converter</name>
+    <message>
+        <source>PimConverter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;It is not a good idea to usethe same source and destformat !&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pim-Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Starting to convert the database for %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No SQLite2 database could be found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The database is already converted!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Conversion not possible: &lt;br&gt;Problem: %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: &lt;br&gt;Converting the database was impossible! &lt;br&gt;Command/Reason: &apos;%1&apos; &lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you really sure that you want to convert your database from sqlite V2 to sqlite V3?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;An internal error occurred: sqlite3 was not accessible! Please correct the PATH or install this packages!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Conversion is finished!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>converter_base</name>
+    <message>
+        <source>PIM-Database Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Converter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade to SQLite3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TodoList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Datebook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Source/Destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SQL (SQLite)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Convert from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase before copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
index 7299dca..92ab2d2 100644
--- a/i18n/mk/osearch.ts
+++ b/i18n/mk/osearch.ts
@@ -26,126 +26,146 @@
         <translation type="obsolete">роковник</translation>
     </message>
     <message>
         <source>adressbook</source>
         <translation type="obsolete">адресар</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Пребарувај</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Спребарувај Се</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
-        <translation>Внимавај на големи и мали букви</translation>
+        <translation type="obsolete">Внимавај на големи и мали букви</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>КОристи спец. карактери</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Внеси ги зборовите кои се пребаруваат</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Резултати</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>прикажи завршени задачи</translation>
+        <translation type="obsolete">прикажи завршени задачи</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>прикажи изминати настани</translation>
+        <translation type="obsolete">прикажи изминати настани</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>барај во датуми</translation>
+        <translation type="obsolete">барај во датуми</translation>
     </message>
     <message>
         <source>show</source>
         <translation>прикажи</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>уреди</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>изврши</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>офтвори во управувач со датотеки</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Датотека:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Врска:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>отвори со</translation>
     </message>
     <message>
         <source>search content</source>
-        <translation>пребарај содржина</translation>
+        <translation type="obsolete">пребарај содржина</translation>
     </message>
     <message>
         <source>searching %1</source>
         <translation>пребарување %1</translation>
     </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search content</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/oxygen.ts b/i18n/mk/oxygen.ts
index 3ac9566..064d8da 100644
--- a/i18n/mk/oxygen.ts
+++ b/i18n/mk/oxygen.ts
@@ -4,48 +4,52 @@
     <message>
         <source>Molecular Weight</source>
         <translation>Молекуларна тежина </translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Хемиска формула</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Израчунај</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Исчисти</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Молекуларна тежина (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Елементарни состојки (%):</translation>
     </message>
+    <message>
+        <source>CalcDlg</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/цм^3</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/mk/oyatzee.ts b/i18n/mk/oyatzee.ts
new file mode 100644
index 0000000..058674e
--- a/dev/null
+++ b/i18n/mk/oyatzee.ts
@@ -0,0 +1,20 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DiceWidget</name>
+    <message>
+        <source>Roll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OYatzee</name>
+    <message>
+        <source>OYatzee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only three rolls per turn allowed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/packagemanager.ts b/i18n/mk/packagemanager.ts
index 04accf9..a9211b1 100644
--- a/i18n/mk/packagemanager.ts
+++ b/i18n/mk/packagemanager.ts
@@ -38,48 +38,88 @@
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tap here to filter package list by application category.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the application category to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by package name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the package name to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by the package status.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the package status to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by source server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the source server to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the destination location to filter by here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Прифати</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Откажи</translation>
     </message>
 </context>
 <context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished">Цел</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">Слободен простор</translation>
     </message>
     <message>
         <source>Output</source>
@@ -250,179 +290,176 @@
         <translation type="obsolete">Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="obsolete">Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="obsolete">Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="obsolete">Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="obsolete">Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="obsolete">Детален излез</translation>
     </message>
 </context>
 <context>
-    <name>Ipkg</name>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="obsolete">AQPkg - менаџер на пакети</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Искуцај го текстот за пребарување.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="obsolete">Клики овде за да се сокрие палетата за брзи скокови.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Освежи листа</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Кликни овде за да се освежи листата од серверите.</translation>
+        <translation type="obsolete">Кликни овде за да се освежи листата од серверите.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
+        <translation type="obsolete">Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Кликни овде за да се превземат избраните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Примени промени</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
+        <translation type="obsolete">Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Прикажи ги неинсталираните пакети</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Прикажи инсталирани пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Прикажи ги надградените пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
+        <translation type="obsolete">Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="obsolete">Филтрирај по категорија</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="obsolete">Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="obsolete">Постави категорија за филтрирање</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="obsolete">Кликни овде за се промени категоријата за користениот филтер.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
+        <translation type="obsolete">Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Најди текст</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
+        <translation type="obsolete">Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="obsolete">Палета за брзо скокање</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="obsolete">Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
+        <translation type="obsolete">Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="obsolete">Сервери:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="obsolete">Кликни овде за да се избере извор на пакети.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Пакети</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="obsolete">Ова е листа на сите пакети од избраниот извор
 
 Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
@@ -537,178 +574,234 @@ Oie/Qtopia е вклучена
     </message>
     <message>
         <source>R</source>
         <translation type="obsolete">Р</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="obsolete">Дали сакаш да се отстрани или надгради
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="obsolete">Одстрани или Надгради</translation>
     </message>
     <message>
         <source>U</source>
         <translation type="obsolete">У</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="obsolete">Надградба на стартувач...</translation>
     </message>
     <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update package information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upgrade installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter path to download package to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or upgrade</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove or reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config updated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This is a listing of all packages.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
-Click inside the box at the left to select a package.</source>
+Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
+        <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to apply current filter.</source>
+        <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter settings</source>
+        <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to change the package filter criteria.</source>
+        <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Package Manager</source>
+        <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Update package information</source>
+        <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Upgrade installed packages</source>
+        <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter path to download package to:</source>
+        <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download packages</source>
+        <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or upgrade</source>
+        <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove or reinstall</source>
+        <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reinstall</source>
+        <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config updated</source>
+        <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The configuration has been updated.  Do you want to update server and package information now?</source>
+        <source>Tap here to find the next package name containing the text you are searching for.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to hide the find toolbar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
-        <source>OIpkg</source>
+        <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error initialing libipkg</source>
+        <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error freeing libipkg</source>
+        <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Прокси сервери</translation>
     </message>
     <message>
         <source>Options</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>Server</source>
-        <translation type="unfinished">Сервер</translation>
+        <translation type="obsolete">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Име:</translation>
+        <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished">Адреса:</translation>
+        <translation type="obsolete">Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Активен Сервер</translation>
+        <translation type="obsolete">Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished">Надгради</translation>
+        <translation type="obsolete">Надгради</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Вклучено</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished">Корисничко име:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">Лозинка:</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Форсирај Зависности</translation>
@@ -724,128 +817,279 @@ Click inside the box at the left to select a package.</source>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished">Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished">Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished">Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished">Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished">Детален излез</translation>
     </message>
+    <message>
+        <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to edit the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to delete the entry selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the HTTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the HTTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the URL address of the FTP proxy server here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the FTP proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the username for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the password for the proxy servers here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select information level for Ipkg.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgDestDlg</name>
+    <message>
+        <source>Edit Destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Име:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished">Локација:</translation>
+    </message>
+    <message>
+        <source>Enter the absolute directory path of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the desired location.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OIpkgServerDlg</name>
+    <message>
+        <source>Edit Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether this entry is active or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Име:</translation>
+    </message>
+    <message>
+        <source>Enter the name of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Адреса:</translation>
+    </message>
+    <message>
+        <source>Enter the URL address of this entry here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compressed server feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to indicate whether the server support compressed archives or not.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This area contains information about the package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area contains a list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to retrieve list of files contained in this package.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;b&gt;Цел&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Инсталирано во&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Големина&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Оддел&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Име на датотека&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt;Инсталирана Верзија&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="obsolete">&lt;p&gt;&lt;b&gt; Достапна Верзија&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="obsolete">Информации за пакет</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="obsolete">Информациите за пакетот не се достапни</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="obsolete">Затвори</translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation type="obsolete">Одстрани</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="obsolete">Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="obsolete">Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="obsolete">Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="obsolete">Прокси сервери</translation>
     </message>
diff --git a/i18n/mk/powerchord.ts b/i18n/mk/powerchord.ts
new file mode 100644
index 0000000..42a7f04
--- a/dev/null
+++ b/i18n/mk/powerchord.ts
@@ -0,0 +1,357 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>PowerchordBase</name>
+    <message>
+        <source>Powerchord</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m6th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dim</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m9th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7sus2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m11th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m13th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>maj13</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6/9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>flat5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7#9</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>12th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>14th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16th</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>F#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guitar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alternative tunings are possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EBEG#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EAEAC#E</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADF#BE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EADGCF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGAD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGCGCD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADF#AD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DGDGBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DADACD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CGCGAE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FADGBE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>G minor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Span: the greatest number of frets over which you want chords to be generated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner operation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chord list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;This chord has been saved into the list of chords, for later playback.&lt;P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Unable to open device for sound playback - check that no other application is using it.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Using the microphone, the note&apos;s frequency is analysed. This is a simulation.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/pyquicklauncher.ts b/i18n/mk/pyquicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/pyquicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 03a9c0c..74b95ad 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -366,67 +366,81 @@ Please charge the back-up battery.</source>
         <source>Add</source>
         <translation type="unfinished">Додај</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Состојба на батерија</translation>
     </message>
 </context>
 <context>
+    <name>QueuedRequestRunner</name>
+    <message>
+        <source>Processing Queued Requests</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Server</name>
+    <message>
+        <source>USB Lock</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index 5c1d0e5..320caaa 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -49,132 +49,164 @@ You can only select an actually configured user.</source>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Синхронизирај</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>192.168.129.0/24</source>
-        <translation type="unfinished">192.168.129.0/24</translation>
+        <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished">192.168.1.0/24 </translation>
+        <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished">192.168.0.0/24 </translation>
+        <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished">172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished">10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ништо</translation>
     </message>
+    <message>
+        <source>Important notice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug options</source>
+        <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t protect this config screen</source>
+        <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show explanatory screens</source>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Testing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test the authentication now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Note: the third option implies the second one</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="obsolete">Намести лозинја</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">Смени лозинка</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="obsolete">Внеси лозинка</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="obsolete">Неточна лозинка</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
diff --git a/i18n/mk/sfcave-sdl.ts b/i18n/mk/sfcave-sdl.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/sfcave-sdl.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/sfcave.ts b/i18n/mk/sfcave.ts
index 4eb9e18..c9ad85e 100644
--- a/i18n/mk/sfcave.ts
+++ b/i18n/mk/sfcave.ts
@@ -1,2 +1,16 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Help for SFCave</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;SFCave Help&lt;/h1&gt;&lt;p&gt; SFCave is a flying game for the Zaurus.&lt;br&gt;&lt;br&gt; The aim is to stay alive for as long as possible and get the highest score you can.&lt;br&gt;&lt;br&gt;There are three game types currently - SFCave, Gates, and Fly.&lt;br&gt;&lt;b&gt;SFCave&lt;/b&gt; is a remake of the classic SFCave game - fly through the cavern avoiding all the blocks that just happen to be hanging in midair&lt;br&gt;&lt;br&gt;&lt;b&gt;Gates&lt;/b&gt; is similar to SFCave but instead you must fly through the without crashing.&lt;br&gt;&lt;br&gt;&lt;b&gt;Fly&lt;/b&gt; is somewhat different to SFCave and above. Instead, you have are flying in the open air above a scrolling landscape, and the aim is to hug the ground - the closer to the land you fly the more points scored.&lt;br&gt;&lt;br&gt;&lt;br&gt;Basic instruction - Press &lt;b&gt;Up&lt;/B&gt; or &lt;b&gt;Down&lt;/b&gt; on the circle pad to start a new game, press the middle of the pad to apply thrust (makes you go up), and release the pad to remove thrust and drop down.&lt;br&gt;&lt;br&gt;Also, if playing the Fly game, you can press z to toggle the display of the scoring zones. This will display 4 red lines at varying heights above the landscape - if your ship falls into this zone, point are scored. The closer to the landscape you get the more points you get.&lt;br&gt;&lt;br&gt;In addition, SFCave has replays - save and load too so you can show off to all your friends (or vice versa). Currently, this is in its infancy but will improve.&lt;br&gt;To use, once you have crashed, press &apos;r&apos; to replay the last game.&lt;br&gt;To save the replay press &apos;s&apos;.&lt;br&gt;To load a saved replay press &apos;l&apos; (after you&apos;ve crashed at least once).&lt;br&gt;&lt;br&gt;Replays are currently saved to your home directory in a file called sfcave.replay.This file can be copied and given to others as long as it it put in their home directory.&lt;br&gt;&lt;br&gt;Have lots of fun.&lt;br&gt;Andy&lt;/p&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/simple-icon.ts b/i18n/mk/simple-icon.ts
new file mode 100644
index 0000000..dfdccec
--- a/dev/null
+++ b/i18n/mk/simple-icon.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable fire string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple-main.ts b/i18n/mk/simple-main.ts
new file mode 100644
index 0000000..d962dc5
--- a/dev/null
+++ b/i18n/mk/simple-main.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fire</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple-pim.ts b/i18n/mk/simple-pim.ts
new file mode 100644
index 0000000..32a0072
--- a/dev/null
+++ b/i18n/mk/simple-pim.ts
@@ -0,0 +1,60 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>My MainWindow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Current</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Views the current record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PIMListView</name>
+    <message>
+        <source>Start </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> This is an All-Day Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/simple.ts b/i18n/mk/simple.ts
new file mode 100644
index 0000000..846ed58
--- a/dev/null
+++ b/i18n/mk/simple.ts
@@ -0,0 +1,18 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Simple</name>
+    <message>
+        <source>My Simple Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click on the button or follow the white rabbit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <comment>translatable quit string</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/stocktickertest.ts b/i18n/mk/stocktickertest.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/mk/stocktickertest.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 1c10578..957a780 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -40,52 +40,48 @@
     <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>
-    <message>
-        <source>Compare:</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>
@@ -323,69 +319,77 @@ to this process?</source>
     <message>
         <source>Storage</source>
         <translation>Медиум</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Процесор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процесс</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Верзија</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Syslog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Компајлирано од:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Изградено на:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt; Верзија:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="obsolete">&lt;p&gt;Модел:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="obsolete">&lt;p&gt; Производител:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Оваа страна ја прикажува верзијата на Opie, кернелот и дистрибудиајта.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Built against Qt/E </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/tableviewer.ts b/i18n/mk/tableviewer.ts
index 2e59f14..2f6b123 100644
--- a/i18n/mk/tableviewer.ts
+++ b/i18n/mk/tableviewer.ts
@@ -1,34 +1,34 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
+        <translation type="obsolete">Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
+        <translation type="obsolete">ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
     </message>
 </context>
 <context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Ресетирај</translation>
     </message>
     <message>
         <source>key</source>
         <translation>клуч</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Прегледувач на Табели - уреди клучеви</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Име на клуч</translation>
     </message>
     <message>
diff --git a/i18n/mk/textedit.ts b/i18n/mk/textedit.ts
index 011e5a1..cd9ae1f 100644
--- a/i18n/mk/textedit.ts
+++ b/i18n/mk/textedit.ts
@@ -176,48 +176,52 @@ Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index 7e64257..70d750c 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -1,51 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Денес</translation>
+        <translation type="unfinished">Денес</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Сопственост на</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пополни ја визит картата</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Кликни овде за да се стартува асоцираната апликација</translation>
     </message>
     <message>
         <source>No plugins found</source>
-        <translation>Нема додатоци</translation>
+        <translation type="obsolete">Нема додатоци</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Нема активни додатоци</translation>
     </message>
+    <message>
+        <source>Today Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
index b2fa184..3ac8538 100644
--- a/i18n/mk/todolist.ts
+++ b/i18n/mk/todolist.ts
@@ -1,199 +1,229 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="obsolete">&lt;h1&gt;Аларм на %0 &lt;h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished">&lt;h1&gt;Аларм на %1 &lt;h1&gt;&lt;br&gt;</translation>
     </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Незапишано</translation>
+    </message>
+</context>
+<context>
+    <name>NewTaskDlg</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Нова задала</translation>
+    </message>
+    <message>
+        <source>Blank task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Using template:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Information</source>
         <translation>Информација</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Аларми</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Листа на задачи</translation>
+    </message>
+    <message>
+        <source>Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Внеси задача</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Уреди Задача</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>тивок</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>Гласен</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Нова од поставка</translation>
+        <translation type="obsolete">Нова од поставка</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Нова задала</translation>
+        <translation type="obsolete">Нова задала</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Кликни овде за да се зададе нова задача.</translation>
+        <translation type="obsolete">Кликни овде за да се зададе нова задача.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Уреди Задача</translation>
+        <translation type="obsolete">Уреди Задача</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Кликни овде за да се измени задачата.</translation>
+        <translation type="obsolete">Кликни овде за да се измени задачата.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Види Задача</translation>
+        <translation type="obsolete">Види Задача</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Избриши...</translation>
+        <translation type="obsolete">Избриши...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Кликни овде за да ја отстраниш моменталната задача.</translation>
+        <translation type="obsolete">Кликни овде за да ја отстраниш моменталната задача.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Избриш се...</translation>
+        <translation type="obsolete">Избриш се...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Избриши завршени</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Дуплирај</translation>
+        <translation type="obsolete">Дуплирај</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Пренеси</translation>
+        <translation type="obsolete">Пренеси</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
+        <translation type="obsolete">Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Најди</translation>
+        <translation type="obsolete">Најди</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Покажи завршени задачи</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Покажи само задалчи со прекорачан рок</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Покажи крајни рокови</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Покажи палета</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Податоци</translation>
+        <translation type="obsolete">Податоци</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Категорија</translation>
+        <translation type="obsolete">Категорија</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Опции</translation>
+        <translation type="obsolete">Опции</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Ова е листа на задачи.
 
 Листата ги прикажува следните информации:
 1. Завршени - одбележани со зелено.Кликни овде за да се заврши некоја задача.
 2. Приоритет - Графичка репрезентација на приоритетот на задачата. Кликни двапати за да се измени.
 3. Опис - Опис на задачата. Кликни овде за да се избере задачата.
 4. Краен рок - крајниот рок на задачата.</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Сите категории</translation>
+        <translation type="obsolete">Сите категории</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Незапишано</translation>
+        <translation type="obsolete">Незапишано</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема простор</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Роковникот неможеше 
 да ги сними промените
 ослободи простор
 и обиди се повторно
 
 Прекини?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Роковник</translation>
     </message>
     <message>
@@ -213,49 +243,49 @@ Quit Anyway?</source>
         <translation>&lt;p&gt;%1 новаи задача. &lt;p&gt;Дали да се додадат на листата на задачи?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Нови задачи</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>С.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Опис</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Краен рок</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation>Подеси поставки</translation>
+        <translation type="obsolete">Подеси поставки</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Уредувач на поставки</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Нов поставка %1</translation>
diff --git a/i18n/mk/wellenreiter.ts b/i18n/mk/wellenreiter.ts
index ae20a32..042d61f 100644
--- a/i18n/mk/wellenreiter.ts
+++ b/i18n/mk/wellenreiter.ts
@@ -96,147 +96,143 @@ Should I kill it for you?</source>
 <context>
     <name>Wellenreiter</name>
     <message>
         <source>Your wireless card
 should now be usable again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No device configured.
 Please reconfigure!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The configured device (%1)
 is not available on this system
 . Please reconfigure!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t bring interface &apos;%1&apos; up:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;are not matching!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bring your device into
 monitor mode now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t set interface &apos;%1&apos;
 into monitor mode:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Continue with limited functionality?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t open packet capturer for
 &apos;%1&apos;:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wellenreiter II - replaying capture file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Got packet with protocol &apos;%1&apos;</source>
         <comment>Protocol Name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t do that!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No wireless
 interface available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop sniffing before
 joining a net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Function only available on Embedded build</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;The Wireless Extension Versions&lt;br&gt;do not match!&lt;p&gt;  Wellenreiter II : WE V%1&lt;br&gt;Interface driver: WE V%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterBase</name>
     <message>
         <source>Wellenreiter/Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wellenreiter/X11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hex</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Networks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WellenreiterConfigBase</name>
     <message>
-        <source>Wellenreiter II COnfiguration Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;select&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cisco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wlan-ng</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hostap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orinoco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -495,52 +491,48 @@ joining a net.</source>
         <source>Wireless Station:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the action to perform when a new wired station is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose an action to perform when a new network is detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Intrusion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fake Mac:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send proble requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;automatic&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44:44:44:44:44:44</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try to authenticate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable active scanning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request DHCP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -578,48 +570,56 @@ joining a net.</source>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port number where the gps daemon listens on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start gpsd on localhost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to start the GPS daemon on localhost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gpsd -p /dev/ttyS3 -s 4800</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command line to start the gps daemon.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wellenreiter II Configuration Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send probe requests</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WellenreiterMainWindow</name>
     <message>
         <source>Click here to start scanning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to stop scanning.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to open the configure dialog.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upload a capture session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/zlines.ts b/i18n/mk/zlines.ts
new file mode 100644
index 0000000..7f2e967
--- a/dev/null
+++ b/i18n/mk/zlines.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KLines</name>
+    <message>
+        <source>&amp;New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ne&amp;xt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points: 0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Score: %1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index d003d7c..06fbae6 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -401,49 +401,49 @@ shows the list of dirs and files</source>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
-        <translation>Kann das Verzeichnis
+        <translation type="obsolete">Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
@@ -485,109 +485,109 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
+        <translation type="unfinished">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
@@ -677,99 +677,85 @@ die Daten speichern?</translation>
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>New entry</source>
         <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>
@@ -790,33 +776,57 @@ You have to create a new document</source>
     <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>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/zsame.ts b/i18n/mk/zsame.ts
new file mode 100644
index 0000000..d134e06
--- a/dev/null
+++ b/i18n/mk/zsame.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ZSameWidget</name>
+    <message>
+        <source>ZSame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart This Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>