20 files changed, 391 insertions, 171 deletions

diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
index 3f6e0df..66da691 100644
--- a/i18n/mk/addressbook.ts
+++ b/i18n/mk/addressbook.ts
@@ -1,1518 +1,1564 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Име и Презиме</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Избор</translation>
     </message>
 </context>
 <context>
+    <name>AbView</name>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Не е внесено</translation>
+    </message>
+</context>
+<context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation>Контакт</translation>
+        <translation type="obsolete">Контакт</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Преглед</translation>
+        <translation type="obsolete">Преглед</translation>
     </message>
     <message>
         <source>List</source>
-        <translation>Листа</translation>
+        <translation type="obsolete">Листа</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation>Катичка</translation>
+        <translation type="obsolete">Катичка</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Ново</translation>
+        <translation type="obsolete">Ново</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Уреди</translation>
+        <translation type="obsolete">Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Избриши</translation>
+        <translation type="obsolete">Избриши</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Пронајди</translation>
+        <translation type="obsolete">Пронајди</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation>Започни Пребарување</translation>
+        <translation type="obsolete">Започни Пребарување</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation>Затвори Пребарување</translation>
+        <translation type="obsolete">Затвори Пребарување</translation>
     </message>
     <message>
         <source>Write Mail To</source>
-        <translation>Напиши е-порака до</translation>
+        <translation type="obsolete">Напиши е-порака до</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation>Пренеси запис</translation>
+        <translation type="obsolete">Пренеси запис</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation>Вметни вКаричка</translation>
+        <translation type="obsolete">Вметни вКаричка</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation>Извези вКаричка</translation>
+        <translation type="obsolete">Извези вКаричка</translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation>Мои лични детали</translation>
+        <translation type="obsolete">Мои лични детали</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation>Сними ги сите податоци</translation>
+        <translation type="obsolete">Сними ги сите податоци</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>Конфигурација</translation>
+        <translation type="obsolete">Конфигурација</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Треба да изберете контакт!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Треба да поставите име на даотека !</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Точен тип на датотека ?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Избраната датотека
 не завешува со „.vcf“
 Дали сакате да ја отворите?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Не</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Додади контакт?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Дали сакате да додадете контакт за
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Да за сите</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Неможе да се уредуваат податоците, во моментот се синхронизираат</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation>Уреди Адреса</translation>
+        <translation type="obsolete">Уреди Адреса</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Ѕреди ги моите лични детали</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Контакти -  мои лични детали</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Неможе да се сними информацијата.
 Ослободте простор
 и обидете се повторно
 
 Излегување?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Не е пронајдено</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Не можеше да се пронајде контакт за 
 ова пребарување!</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation>Катички</translation>
+        <translation type="obsolete">Катички</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Не е внесено</translation>
+        <translation type="obsolete">Не е внесено</translation>
+    </message>
+    <message>
+        <source>Edit Contact</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Кликнете на јазиче за да изберете едно</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Подесувања за пребарување</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Стил на прашање</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Подесувања за стилот на прашањето на пребарување</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Користи регуларни изрази</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Алатката за пребарување очекува регуларен израз доколку се избере</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Користи специјални знаци (*,?)</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Алатката за пребарување очекува само едноставни специјални знаци</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на Големи и Мали букви</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Доколку е изврано, пребарувањето ги разликува големите и малите букви</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мал</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Големина на фонт за листа - преглед на картички</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормален</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Алатки-/Мени палета</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Фиксиран</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Префрли се на фиксирано мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Поместиливи</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Префрли се на поместливо мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Електронска Пошта</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Подесувања на фонт за листа и преглед на картички</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Преферирам QT-Mail</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Користи ја апликацијата за електронска пошта на Sharp доколку е достапна</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Преферирам Opie-Mail</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Користи OPIE апликација за електронска пошта ако е инсталирана</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Забелешка: QT-Mail е 
 достапен само на  
 SHARP основниот ROM.
 Оpie-Mail е слободен !</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Подреди</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Избери редослед на контакти:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Нагоре</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Помести го избраниот атрибут еден ред погоре</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Помести го избраниот атрибут еден ред подоле</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Листа на сите достапни атрибути</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Додај го избраниот атрибут од долната на горната листа</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Отстрани</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Отстрани го избраниот атрибут од горната листа</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Подреди (горе -&gt; доле) го дефинира примарниот контакт прикажан во втората колона на прегледот по листа </translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Полно име...</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Притиснете enter за да внесете презиме, средно име и име</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Внесете го целото име директно! Доколку имате презиме со повеќе зборови (на пр, Јакимовска Јосифовиќ), напишете &lt;презиме&gt;,&lt;име&gt; пр: Јакимовска Јосифовиќ, Слободанка</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно Место</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Работно Место..</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Нешто како „јр.“..</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Организација</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Работно место на контактот</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Притисно ма атрибутот кој сакате да го измените</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Зачувај како</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Притиснете да изберете како да го зачувате името (и како да го прикажете во прегледот на листата)</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Забелешки...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Град</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Република</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Поштенски код</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Држава</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Соединети Држави</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Велика Британија</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Авганистан</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Албанија</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Алгерија</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Америчка Самоа</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Андора</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Ангола</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Ангулија</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Антартик</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Аргентина</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Ерменија</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Аруба</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Аустралија</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Австриа</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Азејберџан</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Бахами</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Бахиран</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Бангладеш</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Барбадос</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Беларус</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Белгија</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Белз</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Бенин</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Бермуди</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Бхутан</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Боливија</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Боцвана</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Боветски острови</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Бразил</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Бурнеи</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Бугарија</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Буркина</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Бурунди</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Камбоџа</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Камерун</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Канада</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Кејп Верде</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Кајмански острови</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Чад</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Чиле</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Кина</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Божиќни острови</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Колумбија</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Коморос</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Конго</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Кук Остров</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Коста Рика</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Коте</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Хрватска</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Куба</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Кипар</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Чешка</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Данска</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Џибути</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Доминиканска република</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Доминиканска република</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Источен Тиомор</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Еквадор</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Египед</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Ел Салвадор</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Екваторијална Гвинеја</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Еритреа</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Естонија</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Етиопија</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Фалкландски острови</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Фараонски Острови</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Фиџи</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Финска</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Франција</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Француска гвинеа</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Француска Полинезија</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Габон</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Гамбија</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Џорџија</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Германија</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Гахана</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Гибралтар</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Грција</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Гринланд</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Гренада</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Гвадалупе</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Гуам</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Гватемала</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Гвинеа</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Гвинеа-Бису</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Гуана</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Хаити</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Свето Море</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Хондарус</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Хон Конг</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Унгарија</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Исланд</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Индиа</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Индонесија</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Ирска</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Израел</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Италија</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Јамајка</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Јапонија</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Јордан</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Казахстан</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Кенија</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Кирибати</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Кореа</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Кувајт</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Кургзастан</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Лаос</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Латвија</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Лебанон</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Лесто</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Либериа</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Лхтенштајн</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Литванија</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Луксембург</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Макау</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Македонија</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Мадагаскар</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Малави</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Малезија</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Малдиви</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Мали</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Малта</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Мариникве</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Мауритана</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Маурициус</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Мајот</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Мексико</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Микронезија</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Молдова</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Монако</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Монголија</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Мнтесерат</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Мароко</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Мозамби</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Мајамар</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Намбија</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Нару</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Непал</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Холандија</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Нова Каледонија</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Нов Зеланд</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Никарагва</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Ниуе</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Норвешка</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Оман</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Пакистан</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Палау</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Палестина</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Панама</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Папа Нова Гвинеја</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Парагвај</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Перу</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Филипини</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Острови Питчарин</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Полска</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Португалија</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Пуерто Рико</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Кватар</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Рејунион</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Романија</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Русија</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Рованда</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Сент Луција</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Самоа</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>Сан Марино</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Саудиска Арабија</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Сенегал</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Сејчелс</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Сиера Леоне</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Словачка</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Словениа</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Соломонски Острови</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Сомалија</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Јужна Африка</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Шпанија</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Шри Ланка</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Св. Хелена</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Судан</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Суринам</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Свазиланд</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Шведска</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Швајцарија</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Тајван</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Таџекистан</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Танзанија</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Тајланд</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Того</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Токелау</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Тонга</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Тунезија</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Турција</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Туркменистан</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Тувалу</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Уганда</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Украина</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Уругвај</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Узбекистан</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Вануту</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Венецуела</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Виетнам</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Девствени Острови</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Западна Сахара</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Јемен</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Југославија</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Замбија</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Зимбабве</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детаљи</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Внеси Забелешка</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Уреди Име</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Contact</source>
+        <translation type="unfinished">Контакт</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished">Контакти</translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation type="unfinished">Започни Пребарување</translation>
+    </message>
+    <message>
+        <source>Write Mail To</source>
+        <translation type="unfinished">Напиши е-порака до</translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation type="unfinished">Вметни вКаричка</translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished">Извези вКаричка</translation>
+    </message>
+    <message>
+        <source>My Personal Details</source>
+        <translation type="unfinished">Мои лични детали</translation>
+    </message>
+    <message>
+        <source>Show quick search bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Име/Наслов</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Презиме</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Работно Место</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Одделение/Сектор</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Компанија</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Тел. на работа</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Факс на работа</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Службен мобилен</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Адреса за електронска пошта (основна)</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Останати адреси за електронска пошта</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Домашен телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Домашен факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Приватен Мобилен</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Република на Фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Поштенски код на Фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Службен Пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Интернет страница на фирмата</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Канцеларија</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Професија</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Асистент</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Раководител/менаџер</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Град</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Република</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Поштенски код</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Интернет страница</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Сопруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Надимак</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Деца</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Забелешки</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/appearance.ts b/i18n/mk/appearance.ts
index 601f8ee..14d6e4c 100644
--- a/i18n/mk/appearance.ts
+++ b/i18n/mk/appearance.ts
@@ -1,286 +1,294 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Стиловите го контолираат начинот на кој објектите како што се копчињата и лизгачите изгледаат во сите апликации
 
 Килкни овде за избор на стил.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Подесувања...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Кликни овде за конфигурација на избраниот стил
 
 Забелешка: Оваа опција не е достапна за сите стилови.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Декорациите на прозорци го контролираат начинот на кој насловот и копчињата на апликацијата изгледаат.
 
 Кликни овде за избор на декорација.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Избери го името, стилот и големината на основниот фонт за апликациите.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Шемите на бои се колекции на бои кои се користат за разни делови од приказот.
 
 Кликни овде за избор на шема на бои.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Моментално користена шема</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Уреди...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Килкни овде за промена на боите во моментално користената шема.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Кликни овде за да се избрише шемата на бои избрана во листата лево.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сними</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Кликни овдека за да се сними и именува моменталната шема на бои.</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation>Форсирај стилизирање на сите апликации.</translation>
+        <translation type="obsolete">Форсирај стилизирање на сите апликации.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation>Кликни овде за да се дозволи сите апликации да ги користат глобалните подесувања на изгледот.</translation>
+        <translation type="obsolete">Кликни овде за да се дозволи сите апликации да ги користат глобалните подесувања на изгледот.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>Исклучи стилизирање на овие апликации (&lt;b&gt;*&lt;/b&gt; може да се користат како специјални знаци):</translation>
+        <translation type="obsolete">Исклучи стилизирање на овие апликации (&lt;b&gt;*&lt;/b&gt; може да се користат како специјални знаци):</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation>Доколку некои апликации не се прикажуваат правилно со глобалните подесувања на изглед, одредни 
+        <translation type="obsolete">Доколку некои апликации не се прикажуваат правилно со глобалните подесувања на изглед, одредни 
 опции може да бидат исклучени за таа апликација
 
 Овој дел дозволува да се избере аплкација чии подесувања треба да се исклучат.</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation>Бинарна датотека/и</translation>
+        <translation type="obsolete">Бинарна датотека/и</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation>Кликни овде за да се додаде апликација на листата погоре.</translation>
+        <translation type="obsolete">Кликни овде за да се додаде апликација на листата погоре.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation>Кликни овде за да избрише избраната апликација.</translation>
+        <translation type="obsolete">Кликни овде за да избрише избраната апликација.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation>Кликни овде за да се премести избраната апликација погоре во листата.</translation>
+        <translation type="obsolete">Кликни овде за да се премести избраната апликација погоре во листата.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>Кликни овде за да се премести избраната апликација подоле во листата.</translation>
+        <translation type="obsolete">Кликни овде за да се премести избраната апликација подоле во листата.</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Стил на јазичиња:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Kликни овде за избор на стил на јазичињаата (како кај оваа апликација). Стиловите на јазичињатра се:
 
 1. Јазичиња - нормални јазичиња со само со текстуални наслови
 2. Јазичиња/икони - јазичиња со икона за секое јазиче, текстуалното име се појавува само кај активното јазиче
 3. Паѓачка листа - вертикална листа на јазичињата
 4. Паѓачка листа/икони -  верикална листа на јазичињата со икони</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Јазичиња</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Јазичиња/икони</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Паѓачка листа</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Паѓачка листа/икони</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Врв</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Клиикни овде за јазичињата да се појауваваат на врвот на прозорот.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Дно</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Кликни овде за јазичињата да се појавуваат на дното на прозорот.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Насока на ротација:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Подесувања на изгледот</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Ова е прозорец за преглед. Овдека се гледа новиотт изглед на прозорците како што ги менувате опциите.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Стил</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Прозорци</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напредно</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="obsolete">Рестарт</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation type="obsolete">Дали сакате да рестартиреате %1 сега?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">Не</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Сними Шема</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Сними шема</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Шемата веќе постои.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Избриши Шема</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Неможе да се избрише шемата.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation>&lt;ново&gt;</translation>
+        <translation type="obsolete">&lt;ново&gt;</translation>
+    </message>
+    <message>
+        <source>Show Scrollbars on the left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to display scrollbars on the left side instead of the right.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Уреди шема</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Кликни тука за да избереш боја за:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Пример</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Нормален предмет</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Исклучен предмет</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Мени</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Нормален текст</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Одбележан текст</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Копчиња</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Поле за штиклирање</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Пример на прозорец користејќи ги избраните подесувања.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 6ed45a8..2679199 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -1,156 +1,156 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <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>
+    <message>
+        <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished">Обновување</translation>
+    </message>
+    <message>
+        <source>Would you really overwrite your local data?</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>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 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/calculator.ts b/i18n/mk/calculator.ts
index 0483730..23f53b8 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -1,336 +1,340 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
-        <translation>Експериментален Калкулатор</translation>
+        <translation type="obsolete">Експериментален Калкулатор</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>М+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>
 =</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
+    <message>
+        <source>Calculator</source>
+        <translation type="unfinished">Калкулатор</translation>
+    </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Стандарден</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="obsolete">Калкулатор</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Стандарден</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index 739d648..cd2246e 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -1,848 +1,867 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Листа на недели</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месец</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Уреди...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>ТЅраењето на настанот е подолго околку 
 интервалот помежу повторувањата.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Неможе да се менуваат податоците, во моментов се синхронизира</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Дупликат на настан</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Уреди настан</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Минути)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Календарот неможеше 
 да ги зачува промените
 Ослободи простор и овиди се повторно
 
 Прекини?
 </translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Непознато)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Грешка!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Поправи</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Продолжи</translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>П</translation>
     </message>
     <message>
         <source>T</source>
         <translation>В</translation>
     </message>
     <message>
         <source>W</source>
         <translation>С</translation>
     </message>
     <message>
         <source>F</source>
         <translation>П</translation>
     </message>
     <message>
         <source>S</source>
         <translation>С</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00р</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Испрати</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>:00 PM</source>
         <translation>:00 РМ</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 АМ</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>РМ</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Особини</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Прегледи</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Основен преглед:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Листа на недели</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>1Месец</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Скокни на моментално време</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Стил на редови:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Основен</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Среден</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Приказ на време</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Подесувања за аларм</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Претпоставки за Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Почни преглед на настани</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Време на Почеток:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Јан-00. Јан</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstEvent</name>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Уреди</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Дуплирај</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Избриши</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">Испрати</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>С: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Пон.
 Понеделник</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Втор.
 Вторник</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Сред,
 Среда</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Чет.
 Четврток</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">Пет.
 Петок</translation>
     </message>
     <message>
         <source>Sa</source>
         <comment>Saturday</comment>
         <translation type="obsolete">Саб.
 Сабота</translation>
     </message>
     <message>
         <source>Su</source>
         <comment>Sunday</comment>
         <translation type="obsolete">Нед.
 Недела</translation>
     </message>
     <message>
         <source>p</source>
         <translation>п</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Време на почеток</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Време на завршување</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Календар</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Повторување...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Дневен...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Неделно...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Месечно...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Годишно...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Нов настан</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Локација</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Состанок</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Патување</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Јан 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Цел Ден</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Временска зона</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Тивок</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Гласно</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="obsolete">Време на почеток</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Уреди забелешка</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ручек</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ст</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>нд</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>рд</translation>
     </message>
     <message>
         <source>th</source>
         <translation>тх</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Без Повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повторување по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>години</translation>
     </message>
     <message>
         <source>days</source>
         <translation>денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>недела</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторувачки настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Фреквенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Крај на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Без краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Вар1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Вар 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Недела Вар</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>years</source>
         <translation>години</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/gutenbrowser.ts b/i18n/mk/gutenbrowser.ts
index 1bfae93..70a3769 100644
--- a/i18n/mk/gutenbrowser.ts
+++ b/i18n/mk/gutenbrowser.ts
@@ -1,448 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
-        <source>Gutenbrowser Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Downloading Gutenberg Index....</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 1a70175..7bbbd98 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -1,278 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Подесувања на мени</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Палета</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>О-мени</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Табови</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Вчитај аплети во О-мени:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Прикажи ги јазичињата од главното во О-менито</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Одбележи ги аплетите кои ќе бидат во О-менито.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Додава содржини од главното мени во О-менито.</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Пример 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Пример 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Пример 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Уреди Јазиче</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Позадина</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Икони</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Преглед на %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Ова е груб преглед на  избраното јазиче.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Користи свој фонт</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Подредено</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Полна боја</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Слика</translation>
     </message>
     <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>
         <source>Enable big busy indicator</source>
         <translation>Вклучи голем индикатор за зафатеност</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="obsolete">Вклучи трепкачки индикатор за зафатеност</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Избери го јазичето што треба да се уредува или брише.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Додава ново јазиче на главното мени.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Отвара нов дијалок за подесување на избраното јазиче.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Брише јазиче од главното мени.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Активирај го ова ако сакаш да видиш голем индикатор за зафатеност на средината на екранот наместо тој во панелот.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="obsolete">Активирај го ова ако сакаш трепкачки индикатор на зафатеност за време на вчитвуањето на апликациите во главното мени.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Сите јазичиња</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Не е имплементирано</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable static background pixmap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Вчитај аплети во панелот:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Одбери ги аплетите што треба да се прикажат во панелот.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index f6e6187..77c88cd 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -1,74 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;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>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>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiecore2.ts b/i18n/mk/libopiecore2.ts
index 4a4f2b2..427ef9e 100644
--- a/i18n/mk/libopiecore2.ts
+++ b/i18n/mk/libopiecore2.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hinge1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index 496d604..be24c27 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -1,1158 +1,1126 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Коче календар</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">копче контакти</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">копје мени</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">ротирање на екран</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Плава:</translation>
     </message>
     <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>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>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</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>
     <message>
         <source>Week</source>
         <translation type="obsolete">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <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>
+        <source>Click here to filter items by category.</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>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Службен Пејџер:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Сите електронски писма:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Менаџер:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Сопруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Деца:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Ова е настан за цел ден</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Ова е настан од повеќе денови</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Старт:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Крај:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Забелешка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished">%1 %2 од секој</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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/libvmemoapplet.ts b/i18n/mk/libvmemoapplet.ts
index 152214a..cc8bef1 100644
--- a/i18n/mk/libvmemoapplet.ts
+++ b/i18n/mk/libvmemoapplet.ts
@@ -1,13 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VMemo</name>
     <message>
         <source>Note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
         <source>error recording</source>
         <translation>Грешка при снимањето</translation>
     </message>
+    <message>
+        <source>&lt;B&gt;&lt;P&gt;&lt;font size=+2&gt;VMemo-Recording&lt;/font&gt;&lt;/B&gt;&lt;p&gt;%1&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index d7985ab..da97782 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,148 +1,165 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>Wireless Configuration</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WlanInfo</name>
     <message>
-        <source>Interface Information</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>802.11b</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AP</source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
     <message>
-        <source>Noise</source>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WlanInfo</name>
+</context>
 </TS>
diff --git a/i18n/mk/opie-eye.ts b/i18n/mk/opie-eye.ts
index 1fb34c5..02da4de 100644
--- a/i18n/mk/opie-eye.ts
+++ b/i18n/mk/opie-eye.ts
@@ -1,288 +1,300 @@
 <!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>
+        <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start slideshow</source>
+        <source>the Image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dont show seperate windows</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>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm Deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
index ad2176c..b23aa7d 100644
--- a/i18n/mk/opieirc.ts
+++ b/i18n/mk/opieirc.ts
@@ -1,648 +1,719 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DCCProgress</name>
+    <message>
+        <source>Receiving file %1 from %2...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully received %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Peer Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DCCTransferTab</name>
+    <message>
+        <source>DCC Transfers in Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DCC Transfer from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is trying to send you the file %2
+(%3 bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Malformed DCC request from </source>
+        <source>Received a CTCP PING reply from %1: %2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP PING request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Malformed DCC request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opierec.ts b/i18n/mk/opierec.ts
index b7d47ec..6092bd6 100644
--- a/i18n/mk/opierec.ts
+++ b/i18n/mk/opierec.ts
@@ -1,164 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </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>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>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Please select file to play</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/ordesktop.ts b/i18n/mk/ordesktop.ts
index 4eb9e18..abaf308 100644
--- a/i18n/mk/ordesktop.ts
+++ b/i18n/mk/ordesktop.ts
@@ -1,2 +1,49 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QMyDialog</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Desc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <comment>Add Connection</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMyScrollView</name>
+    <message>
+        <source>Remote Desktop Client (RDP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/packagemanager.ts b/i18n/mk/packagemanager.ts
index a9211b1..3ff4dd5 100644
--- a/i18n/mk/packagemanager.ts
+++ b/i18n/mk/packagemanager.ts
@@ -1,1157 +1,1173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="obsolete">Филтер по категории</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="obsolete">Ибери една или повеќе групи</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="obsolete">Вчитување на конфигурацијата...</translation>
     </message>
 </context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished">Аите</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished">Излез</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Старт</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Опции</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished">Непознато</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished">Откажи</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished">Затвори</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished">Сними излез</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Аите</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Текст</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="obsolete">Избриши</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="obsolete">Инсталирај</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="obsolete">Надгради</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="obsolete">(Повторно инсталирај)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="obsolete">(Надгради)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">Цел</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="obsolete">Слободен простор</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">Излез</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="obsolete">Старт</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Опции</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Аите</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="obsolete">Откажи</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="obsolete">
 **** Откажано од Корисник ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="obsolete">**** Прекинат Процес ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="obsolete">Затвори</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="obsolete">Непознато</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="obsolete">Сними излез</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="obsolete">Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="obsolete">Форсирај Зависности</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="obsolete">Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="obsolete">Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <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>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 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 type="obsolete">Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <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 type="obsolete">Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <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 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 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 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 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 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 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">Ова е листа на сите пакети од избраниот извор
 
 Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
 
 Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
 
 Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="obsolete">Кликни тука за да се отрстранта избраните пакети.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">Листана сервери:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">Листа на пакети за:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="obsolete">Освежување на листи на пакети</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="obsolete">ПРЕДУПРЕДУВАЊЕ: Надградба додека
 Oie/Qtopia е вклучена
 НЕ Е ПРЕПОРАЧЛИВО
 
 Дали си сигурен?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="obsolete">Предупредување</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="obsolete">Надградба на инсталираните пакети</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="obsolete">Дали сакаш да се избрише %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="obsolete">Сигурно?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="obsolete">Превземи во</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="obsolete">Внеси пат каде да се снимат превземените датотеки</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="obsolete">Инсталирај пакет</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="obsolete">Внеси локација на пакет</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Нема ништо за работа</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Нема избрани пакети</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="obsolete">Дали сакаш да се отстрани или преинсталира 
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="obsolete">Отстрани или повторно инсталирај</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="obsolete">Повторно Инсталирај</translation>
     </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.
 
 Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">Прокси сервери</translation>
     </message>
     <message>
         <source>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="obsolete">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="obsolete">Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="obsolete">Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
         <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>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished">Ниво на информации</translation>
+        <translation type="obsolete">Ниво на информации</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>
+    <message>
+        <source>Information level:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package source lists directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the directory where package source feed information is stored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the directory where package source feed information is stored.</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>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>
     <message>
         <source>New</source>
         <translation type="obsolete">Ново</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Избриши</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="obsolete">Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="obsolete">Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="obsolete">Надгради</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">Цел</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Локација:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="obsolete">Поврзи со root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="obsolete">HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="obsolete">Вклучено</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="obsolete">FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Корисничко име:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="obsolete">Лозинка:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 74b95ad..a747a78 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,592 +1,592 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="obsolete">Добредојде во Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Преглед по листа</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>Battery is running very low.</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>
         <translation type="obsolete">Визиткарта</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Информации</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="obsolete">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Состојба на батерија</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Стартувач</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Барање документи</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Пребарување на документи</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Документи</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Преглед по листа</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Поврзи апликации</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Додај</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Аудио</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Сите</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
         <source>Limit search to:</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>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>
         <translation type="unfinished">Визиткарта</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Изгаси...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Исклучи</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Рестартирај Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Изгаси</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished">&lt;p&gt;
+        <translation type="obsolete">&lt;p&gt;
 Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Дозволи</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Синхронизирање</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Откажи</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index 320caaa..8b4ec6f 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -1,396 +1,396 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <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>
+    <message>
+        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
+        <translation 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>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <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>
         <translation type="obsolete">Лозинката не е точна.
 Одбиен пристап</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ништо</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="obsolete">Внеси нова лозинка</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="obsolete">Повтторно внеси лозинка</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="obsolete">Сигурносни подесувања</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">Смени лозинка</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="obsolete">Избриши лозинка</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="obsolete">Барај лозинка на подигање</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="obsolete">Синхронизирај</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="obsolete">Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (основна)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ништо</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="obsolete">&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Синхронизирај</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/systemtime.ts b/i18n/mk/systemtime.ts
index b56f5dd..3240b7a 100644
--- a/i18n/mk/systemtime.ts
+++ b/i18n/mk/systemtime.ts
@@ -1,245 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Формат на време</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>сс:мм</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>Д/М сс:мм</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>М/Д сс:мм</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24 саати</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 саати</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 саати</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Формат на датим</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Почеток на недела</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Системско Време</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Претпостави</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation>Баравте одложување за %1 минута, но само %2 минути поминаа по последното барање &lt;br&gt; Да продолжи?</translation>
     </message>
     <message>
         <source>Continue?</source>
         <translation>Продолжи?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Работи: 
 ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Грешка при превземањето на времето од 
 мрежа.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Грешка со ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Временски Сервер</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Грешка при превземањето на времето од 
 сервер:</translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation>%1 секунди</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>Неможе да се поврзе со сервер</translation>
     </message>
+    <message>
+        <source>Retrieving time from network...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Почетно време</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>н/а</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>Поместување на време</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Ново време</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Земи време од мрежа</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>Претпостави поминато време</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Претпоставено поместување</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Претпоставено време</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Помести [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>Последно [n]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>Поместување [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Претпостави време</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>ПОстави претпоставено време</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>s/h</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>секунди</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Временски сервер</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>Минути помеѓу освежувања</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>минути помеѓу освежувања на претпоставки</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>Прикажи информации за сервер</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>Прикажи информации за претпоставки</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Саат</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Минута</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>ПМ</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Временска зона</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Земи време од мрежа</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Постави претпоставено време</translation>
     </message>
 </context>
 </TS>