9 files changed, 439 insertions, 136 deletions

diff --git a/i18n/mk/clock.ts b/i18n/mk/clock.ts
index 3988ee4..f3b1bc9 100644
--- a/i18n/mk/clock.ts
+++ b/i18n/mk/clock.ts
@@ -1,97 +1,282 @@
 <!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>Одложи</translation>
+        <translation type="obsolete">Одложи</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
     </message>
     <message>
         <source>Clock</source>
-        <translation>Саат</translation>
+        <translation type="obsolete">Саат</translation>
     </message>
     <message>
         <source>Stopwatch</source>
-        <translation>Штоперица</translation>
+        <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>Намести Аларм</translation>
+        <translation type="obsolete">Намести Аларм</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation>Намести Датум и време.</translation>
+        <translation type="obsolete">Намести Датум и време.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
-        <translation>Алармопт е вклучен</translation>
+        <translation type="obsolete">Алармопт е вклучен</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
-        <translation>Алармот е исклучен</translation>
+        <translation type="obsolete">Алармот е исклучен</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
-        <translation>Саат: Алармот беше пропуштен.</translation>
+        <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>Alarm set: %1</source>
+        <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
-        <translation>Намести Аларм</translation>
+        <translation type="obsolete">Намести Аларм</translation>
     </message>
     <message>
         <source>Hour</source>
-        <translation>Саат</translation>
+        <translation type="obsolete">Саат</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Минута</translation>
+        <translation type="obsolete">Минута</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation>AM</translation>
+        <translation type="obsolete">AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation>PM</translation>
+        <translation type="obsolete">PM</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
-        <translation>mp3 аларм</translation>
+        <translation type="obsolete">mp3 аларм</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation>Одложи (минути)</translation>
+        <translation type="obsolete">Одложи (минути)</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Сите</translation>
+        <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Аудио</translation>
+        <translation type="obsolete">Аудио</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
index f60f7f4..0ea9e12 100644
--- a/i18n/mk/embeddedkonsole.ts
+++ b/i18n/mk/embeddedkonsole.ts
@@ -40,77 +40,77 @@
         <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>Микро</translation>
+        <translation type="obsolete">Микро</translation>
     </message>
     <message>
         <source>Small Fixed</source>
-        <translation>Мал ограничен</translation>
+        <translation type="obsolete">Мал ограничен</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
-        <translation>Среден ограничен</translation>
+        <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>Јазичиња доле</translation>
+        <translation type="obsolete">Јазичиња доле</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
-        <translation>Јазичиња горе</translation>
+        <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>Црно на Прозирно</translation>
+        <translation type="obsolete">Црно на Прозирно</translation>
     </message>
     <message>
         <source>Black on Red</source>
-        <translation>Црно на Црвено</translation>
+        <translation type="obsolete">Црно на Црвено</translation>
     </message>
     <message>
         <source>Red on Black</source>
-        <translation>Црвено на Црно</translation>
+        <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>
@@ -128,33 +128,33 @@
         <translation>Плаво на Црно</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Црвено на Црно</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Сопствено</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Фонт</translation>
+        <translation type="obsolete">Фонт</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Опции</translation>
+        <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>
@@ -172,25 +172,25 @@
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Залепи</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Уреди</translation>
+        <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>
@@ -206,24 +206,100 @@
     <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>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 6753622..98a0e01 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -78,25 +78,25 @@
         <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>
+        <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>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 1d478ab..0fdcb94 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -8,66 +8,66 @@
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
+        <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
+&lt;/p&gt;
+&lt;p&gt;
+No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
+&lt;/p&gt;
+&lt;p&gt;
+Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
+&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
+&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</source>
+&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
+&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 42b68fc..f6c7c2f 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -1,22 +1,22 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Battery status</source>
-        <translation>Состојба на батерија</translation>
+        <translation type="obsolete">Состојба на батерија</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Затвори</translation>
+        <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>
diff --git a/i18n/mk/libclockapplet.ts b/i18n/mk/libclockapplet.ts
index 4eb9e18..bd02d12 100644
--- a/i18n/mk/libclockapplet.ts
+++ b/i18n/mk/libclockapplet.ts
@@ -1,2 +1,17 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Set time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clock..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
index c6dd090..6b24465 100644
--- a/i18n/mk/libliquid.ts
+++ b/i18n/mk/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
-        <translation type="unfinished">Течен</translation>
+        <translation type="obsolete">Течен</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="obsolete">Течен Стил</translation>
+        <translation type="unfinished">Течен Стил</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="obsolete">Без транспарентност</translation>
+        <translation type="unfinished">Без транспарентност</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="obsolete">Боја на позадина</translation>
+        <translation type="unfinished">Боја на позадина</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="obsolete">Боја на копчиња</translation>
+        <translation type="unfinished">Боја на копчиња</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="obsolete">Прозирна боја на позадина</translation>
+        <translation type="unfinished">Прозирна боја на позадина</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="obsolete">прозирна боја на копчиња</translation>
+        <translation type="unfinished">прозирна боја на копчиња</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="obsolete">Корисничка порзирност</translation>
+        <translation type="unfinished">Корисничка порзирност</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="obsolete">Боја на менито</translation>
+        <translation type="unfinished">Боја на менито</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="obsolete">Боја на текст</translation>
+        <translation type="unfinished">Боја на текст</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="obsolete">Прозирност</translation>
+        <translation type="unfinished">Прозирност</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="obsolete">Користи сенки за текст на мени</translation>
+        <translation type="unfinished">Користи сенки за текст на мени</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="obsolete">Направи копчињата на палетата да изгледаат рамни</translation>
+        <translation type="unfinished">Направи копчињата на палетата да изгледаат рамни</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="obsolete">Контраст</translation>
+        <translation type="unfinished">Контраст</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation type="obsolete">Течен</translation>
+        <translation type="unfinished">Течен</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="obsolete">Течен стил со високи перформанси од Моосфет</translation>
+        <translation type="unfinished">Течен стил со високи перформанси од Моосфет</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiecore2.ts b/i18n/mk/libopiecore2.ts
index e2c4c2e..4a4f2b2 100644
--- a/i18n/mk/libopiecore2.ts
+++ b/i18n/mk/libopiecore2.ts
@@ -64,21 +64,25 @@
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Todo Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index b9c9db9..ab3c97e 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -139,88 +139,29 @@
         <translation>Стил</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
-    <name>OKeyChooserConfigDialog</name>
-    <message>
-        <source>Configure Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>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>
+        <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>
@@ -437,47 +378,129 @@ and </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::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
+    <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>Size</source>
-        <translation type="unfinished">Големина</translation>
+        <source>Key</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <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="unfinished">Mime Тип</translation>
+        <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>