44 files changed, 146 insertions, 2947 deletions

diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
index 66da691..a229b0d 100644
--- a/i18n/mk/addressbook.ts
+++ b/i18n/mk/addressbook.ts
@@ -1,1564 +1,1317 @@
 <!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 type="obsolete">Контакт</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Преглед</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Листа</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Катичка</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ново</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Уреди</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Избриши</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Пронајди</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Започни Пребарување</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Затвори Пребарување</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Напиши е-порака до</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Пренеси запис</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Вметни вКаричка</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Извези вКаричка</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Мои лични детали</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Сними ги сите податоци</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <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 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 type="obsolete">Катички</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <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/advancedfm.ts b/i18n/mk/advancedfm.ts
index f15c742..3598d96 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -1,448 +1,358 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Директориумот не постои</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Менаџер на Датотеки 
-copyright 2002-2003 од 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
- и лиценциран под GPL лиценца</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Прикажи сокриени датотеки</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Промени директориум</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Изврши</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Отвори како текст</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Креирај Директориум</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Мреирај Симболичка врска</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Преименувај</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копирај</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Копирај како</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Копирај ист директориум</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Премести</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Додај во документи</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Изврши команда</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Податоци за датотека</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Постави правила</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Пренеси датотека</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>Напреден Фајл Менаџер</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Неможе да се пренесе 
-тековниот директориум од листата на линкови
-Директорумот не е во листата на линкови!</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Датотека</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Преберување на датотеки</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Извеши команда со излезни податоци</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Избери се</translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="obsolete">Префрлисе на локална листа</translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="obsolete">Префрли се на Далечинска листа
-</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Стави директориум во листа на линкови</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Отстрани го тековниот директориум од листа на линкови</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Да избришам
-%1 датотеки?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Избриши директориум?</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Избриши %1
-и неговата содржина?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Избриши 
-%1?</translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Копирај 
-%1 датотеки?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Датотеката постои!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 посоти. Да ја препишам?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Неможе да се копира %1 во %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-посоти. Да ја препишам?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Неможе да се копиа
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">во</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation type="unfinished">Копирај</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Како</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">веќе постои.Да ја избришам?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Не може да се премести</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>Испис на Напреден Фајл менаџер</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Пренос од Напреден Фајл Менаџер</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>пратено.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1 and all it&apos;s contents?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really delete %1?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Really copy %1 files?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 already  exists. Ok to overwrite?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy %1 As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt; %1 already exists. Ok to overwrite?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt; %1 already exists. Do you really want to delete it?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not move %1&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not copy %1 to %2&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Сними го излезот во датотека (само име)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Постави дозволи на датотека</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Постави дозволи на датотека за:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Сопственик</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>others</source>
         <translation>останати</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Сопственик</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>read</source>
         <translation>чиање</translation>
     </message>
     <message>
         <source>write</source>
         <translation>запишување</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>извршување</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/appearance.ts b/i18n/mk/appearance.ts
index 14d6e4c..535e21b 100644
--- a/i18n/mk/appearance.ts
+++ b/i18n/mk/appearance.ts
@@ -1,294 +1,233 @@
 <!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 type="obsolete">Форсирај стилизирање на сите апликации.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <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 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 type="obsolete">Доколку некои апликации не се прикажуваат правилно со глобалните подесувања на изглед, одредни 
-опции може да бидат исклучени за таа апликација
-
-Овој дел дозволува да се избере аплкација чии подесувања треба да се исклучат.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Бинарна датотека/и</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Кликни овде за да се додаде апликација на листата погоре.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Кликни овде за да избрише избраната апликација.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Кликни овде за да се премести избраната апликација погоре во листата.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <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 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/aqpkg.ts b/i18n/mk/aqpkg.ts
index 8052beb..10fded0 100644
--- a/i18n/mk/aqpkg.ts
+++ b/i18n/mk/aqpkg.ts
@@ -1,671 +1,663 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Филтер по категории</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Ибери една или повеќе групи</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Вчитување на конфигурацијата...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Прифати</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Откажи</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Инсталирај</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Повторно инсталирај)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Надгради)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Слободен простор</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Аите</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Откажи</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Откажано од Корисник ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Прекинат Процес ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Сними излез</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Форсирај Зависности</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Детален излез</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>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>Клики овде за да се сокрие палетата за брзи скокови.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Освежи листа</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Кликни овде за да се освежи листата од серверите.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Примени промени</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Прикажи ги неинсталираните пакети</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Прикажи инсталирани пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Прикажи ги надградените пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Филтрирај по категорија</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Постави категорија за филтрирање</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Кликни овде за се промени категоријата за користениот филтер.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Најди текст</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Палета за брзо скокање</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Сервери:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Кликни овде за да се избере извор на пакети.</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>Ова е листа на сите пакети од избраниот извор
 
 Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
 
 Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
 
 Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Кликни тука за да се отрстранта избраните пакети.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Листана сервери:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Листа на пакети за:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Освежување на листи на пакети</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ПРЕДУПРЕДУВАЊЕ: Надградба додека
 Oie/Qtopia е вклучена
 НЕ Е ПРЕПОРАЧЛИВО
 
 Дали си сигурен?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Предупредување</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Надградба на инсталираните пакети</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Дали сакаш да се избрише %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Сигурно?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Превземи во</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Внеси пат каде да се снимат превземените датотеки</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Инсталирај пакет</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Внеси локација на пакет</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>Дали сакаш да се отстрани или преинсталира 
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Отстрани или повторно инсталирај</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Повторно Инсталирај</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">Р</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Дали сакаш да се отстрани или надгради
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Одстрани или Надгради</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">У</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Надградба на стартувач...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Цел&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&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>&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>&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>&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>&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>&lt;p&gt;&lt;b&gt; Достапна Верзија&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Информации за пакет</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Информациите за пакетот не се достапни</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Сервери</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Прокси сервери</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Адреса:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Активен Сервер</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Поврзи со root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Вклучено</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP прокси</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Корисничко име:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Лозинка:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 2679199..f53ed8e 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -1,156 +1,148 @@
 <!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>Destination</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 23f53b8..ce18055 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -1,340 +1,332 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <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/calibrate.ts b/i18n/mk/calibrate.ts
index c94cab1..eda4b29 100644
--- a/i18n/mk/calibrate.ts
+++ b/i18n/mk/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притисни на кртовите цврсто и 
 прецизно за да се калибрира екранот.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојдовте во Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
index 592134e..570e6c1 100644
--- a/i18n/mk/checkbook.ts
+++ b/i18n/mk/checkbook.ts
@@ -1,750 +1,646 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Нова сметка</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Информации</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Трансакции</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Графикони</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Заштита со лозинка</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Кликни овде за да се заштити со лозинка оваа сметка.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Овде внеси име на смтеката.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Избети тип на сметка овде.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="obsolete">Штедна</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Тековна</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">Кредитна</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Пазар на пари</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Заеднички фонд</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Останато</translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation>Банка:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Внеси име на банката за оваа сметка. </translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Број на сметка:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Внеси го бројот на сметката овде.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN број:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Внеси PIN број за оваа сметка.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Почетна состојба:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Внеси ја почетната состојба на оваа сметка.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Внеси додатни информации за сметката.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="obsolete">Моментална состојба: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="obsolete">Овде е прикажана моменталната состојба на оваа сметка.</translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ова е лита на сите трансакции внесени за оваа сметка.
 
 За да се подреди по полиња, кликни на името на колоната.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Број</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Сума</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Кликни овде за внесување на нова трансакција.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Одбери трансакција и потоа кликни овде за да се измени.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Избери сметка и потоа кликни овде зада се избрише.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Избери го саканиот графикон и потоа кликни на Нацртај копчето.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Кликни на саканиот тип на графикон.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Состојба на сметка</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Повлекувања на средства по категорија</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Депозити по категорија</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Нацртај</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Кликни овде за да се нацрта избраниот графикон.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Моментална состојба: %1 %2</translation>
-    </message>
-    <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Потврдете лозинка</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Потврдете лозинка:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Внесете лозинка за да го потврдите бришењето на заштитата со лозинка:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Избриши трансакција</translation>
     </message>
     <message>
         <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select checkbook sorting here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entry Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SortDate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished">Состојба</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Конфигурирај Сметка</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Внеси симбол за валута:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Внеси ги симболот на локалната валута овде.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Покажи дали сметката е заштитена 
 со лозинка</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Кликни овде за да се избере дали на главниот прозорец да се покажува дали сметката е заштитена или не со лозинка.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Покажи состојби на сметки</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Кликно овде за да се избере дали главниот прозорец ќе ги прикажува моменталните состојби за секоја сметка.</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Account Types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Payees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open last checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last open checkbook will be opened at startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show last checkbook tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save new description as payee</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to save new descriptions in the list of payess.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ListEdit</name>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Кликни овде за да се креира нова сметка.
 
 Може исто така да изберете Ново од менито на Сметка.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Избери сметка и потоа кликни овде за да се уредува.
 
 Може исто да се одбере Уреди од менито Сметка, или да се кликне и да се задржи на името на сметката.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Избери сметка и потоа кликни овде за да се избрише.
 
 Исто така можете да изберете Избриши од менито Сметка.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Кликни овде за да конфигурира апликацијава.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Ова е листа на моментално достапните сметки.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Име на сметка</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Избриши сметка</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>Date</source>
         <translation type="unfinished">Дата</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">Нова</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished">Штедна</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished">Тековна</translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished">Кредитна</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished">Пазар на пари</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished">Заеднички фонд</translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished">Останато</translation>
     </message>
     <message>
         <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Автомобил</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Сметки</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">ЦД-а</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Облека</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Компјутер</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD-а</translation>
     </message>
     <message>
         <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Забава</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Храна</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Гориво</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Општо</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Филмпви</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Кирија</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Патувања</translation>
     </message>
     <message>
         <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Работа</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Член на фамилија</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Општо Кредит</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Трансакција за</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Повлекување средства</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Овде се избира дали трансакцијата е повлекување на средства или депозит.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Депозит</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Датум:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Избери датум на трансакцијата.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Број:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Внеси број на чек.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Внеси опис на трансакцијата.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Избери категорија на трансакцијата.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Избери тип на трансакција.
 
 Опциите варираат во зависност од тоа дали трансакцијата е депозит или повлекување на средства.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Внеси сума на трансакцијата.
 
 Внесената вредност треба секогаш да е позитивна.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Внеси ја сумата на таксата поврзана со трансакцијата.
 
 Вредноста секогаш теба да биде позитивна.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Внеси додатни информации за трансакцијата.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation type="obsolete">Автомобил</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Сметки</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">ЦД-а</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Облека</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Компјутер</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVD-а</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Електроника</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Забава</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Храна</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Гориво</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Општо</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Филмпви</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Кирија</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Патувања</translation>
-    </message>
-    <message>
         <source>Debit Charge</source>
         <translation>Камата на долг</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Напишан чек</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Трансфер</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Кредитна Картичка</translation>
     </message>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Работа</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Член на фамилија</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Општо Кредит</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Автоматско Плаќање</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Кеш</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/clock.ts b/i18n/mk/clock.ts
index f3b1bc9..d25f77d 100644
--- a/i18n/mk/clock.ts
+++ b/i18n/mk/clock.ts
@@ -1,282 +1,206 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AlarmDlg</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Саат</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Одложи</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AlarmDlgBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished">Одложи</translation>
     </message>
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Одложи</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Саат</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Штоперица</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Ресет</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Намести Аларм</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Намести Датум и време.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Алармопт е вклучен</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Алармот е исклучен</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Саат: Алармот беше пропуштен.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily alarm requires at least
 one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Сите</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Аудио</translation>
     </message>
 </context>
 <context>
     <name>ClockBase</name>
     <message>
         <source>Clock</source>
         <translation type="unfinished">Саат</translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished">Штоперица</translation>
     </message>
     <message>
         <source>Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Старт</translation>
     </message>
     <message>
         <source>Starts and stops the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lap/Split</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resets the stopwatch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to enable the daily alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Намести Аларм</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Саат</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Минута</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 аларм</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Одложи (минути)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Сите</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Аудио</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index cd2246e..fb9225d 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -1,867 +1,829 @@
 <!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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Јан-00. Јан</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstEvent</name>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Испрати</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>С: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>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/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
index 0ea9e12..814b354 100644
--- a/i18n/mk/embeddedkonsole.ts
+++ b/i18n/mk/embeddedkonsole.ts
@@ -1,313 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">нов</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">уреди</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">избриши</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">нагоре</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">надоле</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Команди</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Команди&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Препорачани Команди&lt;?B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Микро</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Мал ограничен</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Среден ограничен</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>Листа на Команди</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Скриј листа на команди</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Јазичиња доле</translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Јазичиња горе</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Зелено на Црно</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Црно на Бело</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Бело на Црно</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Црно на Прозирно</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Црно на Црвено</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Црвено на Црно</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Зелено на Жолто</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Плаво на Црвено</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Црвено на Плаво</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Плаво на Бело</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Бело на Плава</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Плаво на Црно</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Црвено на Црно</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Сопствено</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Фонт</translation>
-    </message>
-    <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Простор</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Јазиче</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Горе</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Залепи</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Уреди</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Лево</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Десно</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Лизгач</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Завиткај</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Користи звучен сигнал</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Скриј листа на команди</translation>
     </message>
     <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sessions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To exit fullscreen, tap here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History Lines:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Додади команда</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Внеси Команда за додавање:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/fifteen.ts b/i18n/mk/fifteen.ts
index 01b23a1..4120e17 100644
--- a/i18n/mk/fifteen.ts
+++ b/i18n/mk/fifteen.ts
@@ -1,100 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenConfigDialog</name>
     <message>
         <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select board background</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenConfigDialogBase</name>
     <message>
         <source>Configure Fifteen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Path:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Растури</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Реши</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Петнаесет Парчиња</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Петнаесет Парчиња</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Браво!
 Победи!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Р&amp;астури парчиња</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Постави парчиња</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/formatter.ts b/i18n/mk/formatter.ts
index 1cfd02b..cc98c1e 100644
--- a/i18n/mk/formatter.ts
+++ b/i18n/mk/formatter.ts
@@ -1,213 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Форматер</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Тип на медиум</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Податочни Системи</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Главен</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">ВНИМАНИЕ:
-Промената на параметрите на оваа
-страна може да предизвикагрешки 
-во функционирањето на системот!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Уреди го fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Провери Диск</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Уред</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Точка на прикачување</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напредни</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Формат?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Да се Форматира
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-со</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">податочен систем?!?
-Ќе ги изгубите сите податоци!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Неможе да се форматира.
 Непознат тип</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Излез од форматер</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Се обидувам да откачам.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>откачувањето беше неуспешно!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>
 &amp;ОК</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Неможев да откачам.Уредот е зафатен!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Се обидувам да форматирам.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Нема таков уред!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 Беше успешно форматиран.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Се обидувам да закачам.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Прикачувањето на картичката беше неуспешно!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-беше успешно прикачена.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Сега можете да го затворите прозорот за излез на податоци.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Внатрешна</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Тип на медиум:</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Вкупно %1 кВ (%d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Искористено %1 кВ (%d mB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Слободни: %1 kB (%d mB)</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/go.ts b/i18n/mk/go.ts
index dab24a0..985ea5f 100644
--- a/i18n/mk/go.ts
+++ b/i18n/mk/go.ts
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Нова Игра</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation>Обид</translation>
     </message>
     <message>
         <source>Resign</source>
         <translation>Повлечи се</translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation>Оции за два играчи</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Бели %1, Црни %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Белиот победи.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Црниот победи.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation>Нерешено.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>1 обид</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Заробеници: црн %1, бел %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Оди</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/kbill.ts b/i18n/mk/kbill.ts
index 297a7ef..19c4c98 100644
--- a/i18n/mk/kbill.ts
+++ b/i18n/mk/kbill.ts
@@ -1,68 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>кБили</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Нова игра</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Паузирај игра</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Приказната за кБили</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Правила</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Датотека</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помош</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Паузирај игра</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Приказната&lt;/b&gt;Повторно, судбината на светот е во твои раце! Злобниот хакер, познат по неговиот надимак Били, го има создадено наопасниот компјутерски вирус. Вирус толку моќен што од обичен компјутер може да направи микробранова печка. Били се клонирал во милиони-билиони-трилиони мали  микро-Били. Нивната единствена цел е да го рашират вирусот кој беше паметно маскиран како оперативен систем. Како систем администратор и ектерминатор, твоја работа е да го спречиш Били во неговиот напад.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Прикаската за кБили</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Правила на кБили</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Правила&lt;/b&gt;&lt;p&gt;кБили е дизајнирана да може да ја игра било кој во фамилијата. Годините - деновите на тестирање и консултации со најевтините дизајнери резултираа со игра која е лесна за користење, а сепак не наликува на Мекинтош.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Удри го Били (кликни)&lt;/LI&gt;&lt;LI&gt;Рестартирај го компјутерот (кликни)&lt;/LI&gt;&lt;LI&gt;Собери ги украдените оперативни системи &amp; врати ги (влечи) на нивните копјутери &lt;/LI&gt;&lt;LI&gt;Одвлечи ја корпата врз искрите&lt;/LI&gt;&lt;LI&gt;Бодувањето се базира на времето на играње, како и бонусите за убивање Били.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Остатокот највероватно и сами ќе го сватите. Ние го свативме, така да неможе да е толку тешко</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly disguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Следно ниво</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Бодови</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/keypebble.ts b/i18n/mk/keypebble.ts
index 577c5a6..309bcea 100644
--- a/i18n/mk/keypebble.ts
+++ b/i18n/mk/keypebble.ts
@@ -1,296 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Поврзано</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>ПОврзувањето е одбиено</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Не е пронајден серверот</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Грешка при читање: QSocket пријав грешка при читање
 на податоците, поврзаниот компјутер највероватно ја
 прекинал врската.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket пријави непозната грешка</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Чекам иницијализаија на серверот...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Чекам име на компјутер...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Поврзано со %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Грешка на протокол: Добиена е порака бр. %1,а се очекува порака за освежување.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Грешка на протокол: Серверот %1 користеше непозната кодна табела </translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Чекам верзија на серверот...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Грешка: Невалидна верзија на сервер, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Грешка: Неподрана верзија на сервер, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Логирано</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Грешка: Серверот бара лозинка, лозинката не е специфицирана.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Грешка: Внесената лозинка не е валидна.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Грешка: Премногу невалидни обиди за логирање
 на овој корисник, обидете се подоцна.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Неуспешно логирање</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Премногу грешки</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC прегледувач</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Ново поврзување</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Отвори линк</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Избриши линк</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Цел екран</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Прати Ctrl-ALt-Del</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Откачи врска</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Следнити кликање е двојно кликање</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Следното кликаже е клик со десно копче</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Затвори цел екран</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Поврзи се со сервер</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Логиран на сервер</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Прекината врска</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Листа на линкови</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Избери линк кој треба да се отвори</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC поврзување</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Лозинката на VNC серверот</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Покажи лозинка</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Вклучи прикривање на лозинката</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Лозинка:</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Име на VNC серверот</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Име на линк:</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Име на компјутерот со VNC сервер</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Име на сервер:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Број на приказ:</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Број на приказ на VNC серверот</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Барај сесија која се дели</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Дозволи и други корисници да се поврзуваат со VNC серверот</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Барај 8-битна сесија</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Барај пренос на 8-битна боја од VNC серверот</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Време помеѓу освежувања од серверот</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Намалиго екранот на серверот за да го собере на PDA-то (споро)</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Фактор на намалување</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Милисекунди</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Крени на повик</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Провери освежувања на екран секои:</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Кодни табели</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Хекса кодни табели</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE кодна табела</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>REE кодна табела</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Копирај правоаголник</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Вклучи емитирање на идентични правоаголници како рефернеци за постоечки податоци</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 7bbbd98..87a7419 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -1,286 +1,278 @@
 <!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/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 699b5b9..8c2c3e9 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -1,110 +1,86 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Состојба на батерија</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Затвори</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>неможе да се отвори датотека</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Полнење на двата уреда</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Полнење</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Проценти на остнато напојување</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Состојба на батерија:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Добро</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Ниско</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>На помошно напојување</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Вклучено напојување</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Иклучено надворешно напојување</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Останато време</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Проценти на остнато напојување:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Останато време:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaing Power: %1 %2
 Remaining Time: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
index 6b24465..cfc92de 100644
--- a/i18n/mk/libliquid.ts
+++ b/i18n/mk/libliquid.ts
@@ -1,75 +1,68 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">Течен</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Течен Стил</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Без транспарентност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Боја на позадина</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Боја на копчиња</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Прозирна боја на позадина</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">прозирна боја на копчиња</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Корисничка порзирност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Боја на менито</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Боја на текст</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Прозирност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Користи сенки за текст на мени</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Направи копчињата на палетата да изгледаат рамни</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Контраст</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Течен</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Течен стил со високи перформанси од Моосфет</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index be24c27..b1b57e6 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -1,1126 +1,727 @@
 <!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>Unfiled</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>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>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/libopieui2.ts b/i18n/mk/libopieui2.ts
index 23f5c13..01d0698 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -1,797 +1,175 @@
 <!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>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>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Име:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Тип</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Голем</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Среден</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Мал</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="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>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Име</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Повторувачки Настан</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Нињто</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Ден</translation>
-    </message>
-    <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>Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Одбери Време:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Сними</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="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>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Тип</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Сите пораки</translation>
     </message>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">Опис:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Приоритет:</translation>
-    </message>
-    <message>
-        <source>Very high</source>
-        <translation type="obsolete">Многу високо</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Висок</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Нормално</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Низок</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Многу ниско</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Напредок:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Краен рок:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Категорија:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Основна 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 type="obsolete">Канцеларија:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </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>Business Pager: </source>
-        <translation type="obsolete">Службен Пејџер:</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 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>All Emails: </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>Male</source>
-        <translation type="obsolete">Машки</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Женски</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Пол:</translation>
-    </message>
-    <message>
-        <source>Spouse: </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>Children: </source>
-        <translation type="obsolete">Деца:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Надимак:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Забелешки:</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Локација:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Ова е настан за цел ден</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Ова е настан од повеќе денови</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Старт:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Крај:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Забелешка:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 секој</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">%1 секој</translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">%1 %1 од секој</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Понеделник</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Вторник</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Среда</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Четврток</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Петок</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Сабота</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Недела</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">%1 %2 од секој</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">st</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">nd</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">rd</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">th</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index a993690..e1c76b9 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -1,1034 +1,992 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(повеќе)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Лични</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Повеќе)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Нова категорија</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Нова категорија</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Уреди Категорија</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Апликација</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Овде идат категориите</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Види во кои категории спаѓа документов.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Внеси нова категорија. Притисни &lt;b&gt;Додај&lt;/b&gt; за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Внеси нова категорија лево и притисни додај за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Притисни за да сеизбрише избраната категорија.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Глобална</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Избери за ова својство да биде достапно на сите апликации.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Друга апликација ги 
 уредува категориите.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Уреди категории</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Прикажи го Јануари во избраната година</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Прикажи го претходниот месец</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Прикажи го следниот месец</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Прикаѓи го Декември во избраната година</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Затвори го избирачот на датотеки</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Прикажи ги документите од овој тип</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Прикажи ги документите во оваа категорија</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Кликни за да избереш документ од листата</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, или избери &lt;b&gt;Нов Документ&lt;/b&gt; за да се креира нов документ.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Кликни и држи за својства на докуументот.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Стригот не е пронајден.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Стигнав до крајк, повторно почнувам од почеток</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Барај:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категрија:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Почни со пребарување на:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Дек 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на големина на карактери</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Барај наназад</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Бришењето на датотеката неуспеа.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд Диск</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Копија на</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дупликат</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Неуспешно копирање.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Поместувањето на документот неуспеа.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Користи сопствена ротација</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Однапред вчитај ја апликацијава, за да биде веднаш достапна.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Името на овој документ.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Медимуот на кој е сместен документот.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Брззо вчитување (одзема меморија)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Коментар:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Избриши го документов.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копирај</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Направи копија на документов.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Пренеси</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Пренеси го документов на друг уред.</translation>
     </message>
     <message>
         <source>Arguments:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Информации за сопственикот</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Внеси лозинка</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Нов Документ</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Кликни за да можеш да го поместуваш прозорецов.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Ot&gt;Нема детална  помош за оваа апликација&lt;p&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Што е ова...</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Имаше проблем при креирањето на 
 конфигурациските информации
 за овој програм.
 
 Ослободете простор и
 обидете се повторно.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Неможе да се креираат стартните датотеки
 Ослободете простор 
 пред да внесувате податоци</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">Д</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">М</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>Г</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>ПМ</translation>
     </message>
     <message>
         <source>AM</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>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Дали сакате да го избришете 
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail адреса:</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>Home Web Page: </source>
         <translation>Приватна интернет страна:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Name Title</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>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно место</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Одделение</translation>
     </message>
     <message>
         <source>Company</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>Default Email</source>
         <translation>Основна E-mail адреса</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Е-mail адреси</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>Business Street</source>
         <translation>Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Поштенски код на фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Службен пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Службена интернет страна</translation>
     </message>
     <message>
         <source>Office</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>Home Street</source>
         <translation>Домашна улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Домашен град</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Домашна држава</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Домашен поштенски број</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Домажна држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Приватна интернет страна</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Споруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Надимак</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Деца</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Забелешки</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Групи</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Грешка</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">Д</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">М</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF картичка</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD картичка</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC картичка</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI тврд диск</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внатрешна меморија</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внатрешен медиум</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Извршната датотека „време на град“ не е пронајдена</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>За да ги одберете временските зони,
 инсталирајте го „време на град“.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 датотеки</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Сите %1 датотеки</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Сите датотеки</translation>
     </message>
 </context>
 <context>
     <name>WindowDecoration</name>
     <message>
         <source>Default</source>
         <comment>List box text for default window decoration</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
index 79965f2..9a47150 100644
--- a/i18n/mk/libtodayaddressbookplugin.ts
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -1,114 +1,102 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Максимален бр. на линии:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Подесете го максималниот бр. на линии кои ќе се покажуваат за секоја годишнина/роденден</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="obsolete">Скрати линија по Х карактери:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">После колку карактери информацијата за настанот би требало да биде скратена</translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation>Денови за гледање напред:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Колку денови напред во месецот треба да се изврши пребарување</translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">За да се активираат промените: Рестартирај ја апликацијата!</translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation>Намести боја на наслов:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Бои за насловите!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Намести боја за настан:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Оваа боја ке се користи за да ги прикажува родендените/годишнините!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Намести боја за 
 итно ако е под</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>денови:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Оваа боја ќе се користи ако настанот наближува!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Оваа боја ќе се користи ако роденденот/годишнијната е поблиски од дадениот број на денови!</translation>
     </message>
     <message>
         <source>Enable/Disable Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next birthdays will just be shown, if enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Додаток Адресар</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следниот роденден е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема родендени во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следната годишнина е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема годишнини во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Базата на податоци не го овозможува ова пребарување! Надградете ги libOpie библиотеките! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
index afa4c98..ef30237 100644
--- a/i18n/mk/libtodaydatebookplugin.ts
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -1,146 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[со аларм]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Прикажи локација</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Прилажи забелешки</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Прикажи ги само 
-последните состаноци</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Кокли
-состаноци
-треба да бидат
-прикажани?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Уште колку денови</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Колку денови треба да бидат во опсегот</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">само денес</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished">Прикажи локација</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished">Прилажи забелешки</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished">само денес</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished">Колку денови треба да бидат во опсегот</translation>
     </message>
     <message>
         <source>How many more days</source>
         <translation type="unfinished">Уште колку денови</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Додаток роковник</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Денеска нема повеќе сеостаноци </translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Денеска нема состаноци</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libtodaytodolistplugin.ts b/i18n/mk/libtodaytodolistplugin.ts
index c7bd99d..7f0d2ed 100644
--- a/i18n/mk/libtodaytodolistplugin.ts
+++ b/i18n/mk/libtodaytodolistplugin.ts
@@ -1,59 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>додаток листа на задачи</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Има &lt;b&gt;1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Има &lt;b&gt;%1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Нема активни задачи</translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished">После колку карактери информацијата треба да се скрати</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished">Скрати ја линијата по Х карактеро</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">Прикажани задачи</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Скрати ја линијата по Х карактеро</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">После колку карактери информацијата треба да се скрати</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/libtodayweatherplugin.ts b/i18n/mk/libtodayweatherplugin.ts
index e5d4455..64f4ce0 100644
--- a/i18n/mk/libtodayweatherplugin.ts
+++ b/i18n/mk/libtodayweatherplugin.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Додаток за време</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>Внеси идентификатор за локација:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Внеси код од 4 букви за локацијата. Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да најдете локација блиску до вас.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да ја пронајдете најблиската локација.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Користи метрични единици</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
         <translation>Клики овде за да се избере типот на мерни единици.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Фрекфенција на освежување (во минути):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Одберете колку често (во минути) податоците за времето да се освежуваат.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Вчитување на информациите за моменталната состојба.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Температура:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Ветер:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Притисок:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Податоците за моменталната состојба не се достапни.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>н/а</translation>
     </message>
     <message>
         <source>E </source>
         <translation>И</translation>
     </message>
     <message>
         <source>NE </source>
         <translation>СИ</translation>
     </message>
     <message>
         <source>N </source>
         <translation>С</translation>
     </message>
     <message>
         <source>NW </source>
         <translation>СЗ</translation>
     </message>
     <message>
         <source>W </source>
         <translation>З</translation>
     </message>
     <message>
         <source>SW </source>
         <translation>ЈЗ</translation>
     </message>
     <message>
         <source>S </source>
         <translation>Ј</translation>
     </message>
     <message>
         <source>SE </source>
         <translation>ЈИ</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>Км/Ч</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>М/ч</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">хПа</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,165 +1,148 @@
 <!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>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</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>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/mk/mindbreaker.ts b/i18n/mk/mindbreaker.ts
index 98a674f..0112297 100644
--- a/i18n/mk/mindbreaker.ts
+++ b/i18n/mk/mindbreaker.ts
@@ -1,48 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
         <translation>Нова игра</translation>
     </message>
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>просек на победи: %1 обиди (%2 игри)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Оди %1п%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">Моментален Пат %1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Одговор %1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Ресетирај статистики</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Ресетирај го бројот на победи?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/minesweep.ts b/i18n/mk/minesweep.ts
index 162943d..9496506 100644
--- a/i18n/mk/minesweep.ts
+++ b/i18n/mk/minesweep.ts
@@ -1,37 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Победа!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Експлозија!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Лов на мини</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Почетник</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напреден</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Експерт</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Mine Sweep</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opie-eye.ts b/i18n/mk/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/mk/opie-eye.ts
+++ b/i18n/mk/opie-eye.ts
@@ -1,300 +1,328 @@
 <!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>
+    <message>
+        <source>Default display brightness:</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>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</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>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</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>
+    <message>
+        <source>Display brightness:</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/opie-login.ts b/i18n/mk/opie-login.ts
index 93d5d9a..77c1053 100644
--- a/i18n/mk/opie-login.ts
+++ b/i18n/mk/opie-login.ts
@@ -1,144 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притиснете на крстовите цврсто и 
 прецизно за да го калибрирате екранот.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојдовте во Opie</translation>
-    </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Логирај се</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Добредојдовре во OPIE &lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>КОрисник</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Лозинка</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Суспензирај</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Мени</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Рестартирај</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Изклучи</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Погрешна лозинка</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Внесената лозинка е неточна.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="obsolete">OPIE беше исклучен
-од неозначен сигнал
-(%1)</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Неуспех</translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
-        <translation type="obsolete">Неможе да се стартува OPIE.</translation>
-    </message>
-    <message>
         <source>Could not switch to new user identity</source>
         <translation>Неможе да се префрли на нов идентитет на корисник</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Password:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Confirm:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordDialogImpl</name>
     <message>
         <source>Trying to leave without password set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No password was set. This could lead to you not beeingable to remotely connect to your machine.Do you want to continue not setting a password?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passwords don&apos;t match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The two passwords don&apos;t match. Please try again.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password not legal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The entered password is not a valid password.Please try entering a valid password.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/opiemail.ts b/i18n/mk/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/mk/opiemail.ts
+++ b/i18n/mk/opiemail.ts
@@ -1,817 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Receiver specified</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMailUI</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>send later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>use:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</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>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a filter string here.
 Then hit &quot;get newsgroup list&quot; again and only groups starting 
 with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Newsgroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
index 92ab2d2..f67a258 100644
--- a/i18n/mk/osearch.ts
+++ b/i18n/mk/osearch.ts
@@ -1,171 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OПребарување</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Детали за моменталниот резултат</translation>
     </message>
     <message>
-        <source>applications</source>
-        <translation type="obsolete">апликации</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">документи</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">задолжениа</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">роковник</translation>
-    </message>
-    <message>
-        <source>adressbook</source>
-        <translation type="obsolete">адресар</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Пребарувај</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Спребарувај Се</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">Внимавај на големи и мали букви</translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation>КОристи спец. карактери</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Внеси ги зборовите кои се пребаруваат</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Резултати</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation type="obsolete">прикажи завршени задачи</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">прикажи изминати настани</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">барај во датуми</translation>
-    </message>
-    <message>
         <source>show</source>
         <translation>прикажи</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>уреди</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>изврши</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>офтвори во управувач со датотеки</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Датотека:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Врска:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>отвори со</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">пребарај содржина</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>пребарување %1</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search content</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/oxygen.ts b/i18n/mk/oxygen.ts
index 064d8da..ca1d12e 100644
--- a/i18n/mk/oxygen.ts
+++ b/i18n/mk/oxygen.ts
@@ -1,578 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Молекуларна тежина </translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Хемиска формула</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Израчунај</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Исчисти</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Молекуларна тежина (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Елементарни состојки (%):</translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/цм^3</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Тежина</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Блок</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Негативност на елекрон</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Радиус на атом</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Енергија на јонизација</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Густина</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Точка на ротација</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Точка на сретнување</translation>
-    </message>
-    <message>
         <source>Ionization Energy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Helium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copper</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Europium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lead</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Francium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Radium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Americium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Curium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Californium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Периоден Систем</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ГРЕШКА:
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Хемиски податоци</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/patience.ts b/i18n/mk/patience.ts
index 48700c3..54f2e7c 100644
--- a/i18n/mk/patience.ts
+++ b/i18n/mk/patience.ts
@@ -1,97 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Пасијанс</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Фрисел</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Чикане</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Харп</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>клуб</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Игра</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Смени Карти</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Залепи за позиција</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Подесувања</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;За</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помош</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Играј</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Смени Карти</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Залепи за позиција</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">сврти една карта</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Сврти три карти</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index a747a78..b9e976b 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,592 +1,415 @@
 <!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="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 8b4ec6f..42e0134 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -1,396 +1,244 @@
 <!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>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/snake.ts b/i18n/mk/snake.ts
index 6e46fe7..2c22076 100644
--- a/i18n/mk/snake.ts
+++ b/i18n/mk/snake.ts
@@ -1,50 +1,42 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Змија</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Нова Игра</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>ЗМИЈА!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Користи ги стрелките за да ја управуваш
 смијата да го изеде глувчето. Не смееш да
 се удриш во зидовите, на краевите од екранот или опашката.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Притисни копче за Старт</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>Резултат: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>КРАЈ!!! Резултат: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Притисни копче за Нова Игра.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 957a780..118f753 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -1,395 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Овој граф прикажува колку меморија се користи на оваа Flash картичка.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Овој граф прикажува колку простор има на дискот.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Овој граф покажува колку меморија се користи на оваа SD картичка.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="obsolete">Оваа страна покажува како меморијата се алоцира на овој уред,
-Меморијата се каратеризира според:
-
-1. Искористена - меморија која ја искоритуваат апликациите
-2. Бафери - привремени локации кои се користат за подобрување на перформансите
-3. Кеширани - информации кои биле скоро користени
-4. Слободна - меморија која не се користи.</translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Бафери ( %1 кВ)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кеширана (%1) кВ</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Слободна (%1 кВ)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Вкупно меморија: %1 кВ</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модул</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Искоритено#</translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="obsolete">Искористено од</translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ова е листа на сите вчитани модули на кернелот.
 
 Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Овој дел прикажува детални информации за модулот.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="obsolete">Да се изврши</translation>
-    </message>
-    <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кВ</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Словофни (%1 кВ)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ова е листа на сите провеси.
 
 Килкни и задржи на процес за додатни информации, или да испратиш сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Избери сигнал и кликни на копчето Прати за да се испрати до процесот.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Кликни овде за зибраниот сигнал да се испрати до процесот.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Овде се прикажани деталн информации за процесот.</translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="obsolete">Да испрати</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Информации за ситемот</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Меморија</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Медиум</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Процесор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процесс</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Верзија</translation>
     </message>
     <message>
         <source>Benchmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syslog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Компајлирано од:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Изградено на:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt; Верзија:</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="obsolete">&lt;p&gt;Модел:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="obsolete">&lt;p&gt; Производител:</translation>
-    </message>
-    <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Оваа страна ја прикажува верзијата на Opie, кернелот и дистрибудиајта.</translation>
     </message>
     <message>
         <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built against Qt/E </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/tableviewer.ts b/i18n/mk/tableviewer.ts
index 2f6b123..b02359b 100644
--- a/i18n/mk/tableviewer.ts
+++ b/i18n/mk/tableviewer.ts
@@ -1,69 +1,58 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Ресетирај</translation>
     </message>
     <message>
         <source>key</source>
         <translation>клуч</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
         <translation>Прегледувач на Табели - уреди клучеви</translation>
     </message>
     <message>
         <source>Key Name</source>
         <translation>Име на клуч</translation>
     </message>
     <message>
         <source>Key Type</source>
         <translation>Тип наклуч</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Clear All</source>
         <translation>Исчисти се</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
         <translation>Преглед на листа</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
         <translation>Прегледувач на табели</translation>
     </message>
     <message>
         <source>could not load Document</source>
         <translation>неможе да се вчита документот</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index 70d750c..e38f3b3 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -1,194 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Денес</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Сопственост на</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пополни ја визит картата</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Кликни овде за да се стартува асоцираната апликација</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Нема додатоци</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Нема активни додатоци</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Вчитај додатоци по редослед:</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>активирај/деактивирај додаток или користи ги стрелките за да се смени редоследод на прикажување</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Помести нагоре</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Помести надоле</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>активно/редослед</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">автоматско стартување на 
-продолжување?
-(само за Opie)</translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Избери ако „Денес“ треба автомтски да се стартува.</translation>
-    </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Мал банер</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">минути неактивност</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">големина на икона</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Намести големина на икони</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Освежување</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Колку често треба „Денес“ да се освежува</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">сек</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">никогаш</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">Избери ако „Денес“ треба автомтски да се стартува.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished">минути неактивност</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished">Намести големина на икони</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished">сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished">никогаш</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished">Колку често треба „Денес“ да се освежува</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
index 3ac8538..b3759db 100644
--- a/i18n/mk/todolist.ts
+++ b/i18n/mk/todolist.ts
@@ -1,648 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="obsolete">&lt;h1&gt;Аларм на %0 &lt;h1&gt;&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished">&lt;h1&gt;Аларм на %1 &lt;h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Незапишано</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDlg</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Нова задала</translation>
     </message>
     <message>
         <source>Blank task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Information</source>
         <translation>Информација</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Аларми</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Листа на задачи</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Внеси задача</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Уреди Задача</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>тивок</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>Гласен</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Нова од поставка</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Нова задала</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Кликни овде за да се зададе нова задача.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Уреди Задача</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Кликни овде за да се измени задачата.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Види Задача</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Избриши...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Кликни овде за да ја отстраниш моменталната задача.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Избриш се...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Избриши завршени</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Дуплирај</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">Пренеси</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Најди</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Покажи завршени задачи</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Покажи само задалчи со прекорачан рок</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Покажи крајни рокови</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Покажи палета</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Податоци</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Категорија</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Ова е листа на задачи.
 
 Листата ги прикажува следните информации:
 1. Завршени - одбележани со зелено.Кликни овде за да се заврши некоја задача.
 2. Приоритет - Графичка репрезентација на приоритетот на задачата. Кликни двапати за да се измени.
 3. Опис - Опис на задачата. Кликни овде за да се избере задачата.
 4. Краен рок - крајниот рок на задачата.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Сите категории</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Незапишано</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Нема простор</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Роковникот неможеше 
 да ги сними промените
 ослободи простор
 и обиди се повторно
 
 Прекини?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Роковник</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="obsolete">Неможе да се уредуваат податоци, во моментот се врши синхронизација,</translation>
-    </message>
-    <message>
         <source>all tasks?</source>
         <translation>сите задачи?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>сите завршени задачи?</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;p&gt;%1 новаи задача. &lt;p&gt;Дали да се додадат на листата на задачи?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Нови задачи</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>С.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Опис</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Краен рок</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Подеси поставки</translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation>Уредувач на поставки</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Нов поставка %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде за да поставиш приоритет на нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Внеси опис за новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Повеќе</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде за да се внесат додатни информации за новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Додади опис новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде да ресетираш информации за нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Преглед по табела</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 ден</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>Type</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>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Внеси краток опис на задачата овде.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Заврши</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Работи на</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Купи</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Организирај</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Земи</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Ажурирај</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Создади</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>План</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Повикај</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Електронско писмо</translation>
     </message>
     <message>
         <source>Select priority of task here.</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>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Избери категорија.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Повторувачка задача</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Кликни овде ако задачата се повтрува. </translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">ЗабелеШки:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Овде внеси додатни информации за задачата.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Листа на задачи</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Статус:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Моментална состојба на задачата.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Почнат</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Одложено</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Завршен</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Не е почнат</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Избери ниво на напредок.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Почетен датум:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Намести датум кога е започната задачата.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Краен рок.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Завршено:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Означи ја задачата како завршена.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Намести го датумот на завршување на задачата.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>МОд на одржување:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Намести ја улогатана одржувачот.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Одговорен</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Завршен од</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Координирање</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Одржувач:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Име на раководителот на проектот.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>тест</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Избери одржувач на задачата.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/usermanager.ts b/i18n/mk/usermanager.ts
index 31ad163..ef6aacf 100644
--- a/i18n/mk/usermanager.ts
+++ b/i18n/mk/usermanager.ts
@@ -1,35 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Додади група</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Уреди група</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE менаџер на корисници</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Додади корисник</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>уреди Корисник</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -1,832 +1,566 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
         <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
         <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
         <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
         <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
         <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
         <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
         <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
         <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
         <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
         <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
         <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
         <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;You must create a new document first. Ok to create?&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;Zaurus Password Manager&lt;br&gt;ZSafe version 2.1.2&lt;br&gt;&lt;/b&gt;by Carsten Schneider&lt;br&gt;zcarsten@gmx.net&lt;br&gt;http://z-soft.z-portal.info/zsafe&lt;br&gt;Translations by Robert Ernst&lt;br&gt;robert.ernst@linux-solutions.at&lt;br&gt;&lt;br&gt;&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>