opie-lupdate second attempt

16 files changed, 388 insertions, 144 deletions

diff --git a/i18n/mk/aqpkg.ts b/i18n/mk/aqpkg.ts
index 9a39435..8052beb 100644
--- a/i18n/mk/aqpkg.ts
+++ b/i18n/mk/aqpkg.ts
@@ -182,77 +182,59 @@
         <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>Could not open :</source>
+        <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed </source>
+        <source>Symbolic linking failed!
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to remove </source>
+        <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>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 3dfa35f..3057bb8 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -73,44 +73,60 @@
         <source>Save To</source>
         <translation>Сними во</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>Update Filelist</source>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
 </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/calibrate.ts b/i18n/mk/calibrate.ts
index d6a0825..c94cab1 100644
--- a/i18n/mk/calibrate.ts
+++ b/i18n/mk/calibrate.ts
@@ -1,15 +1,15 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притисни на кртовите цврсто и 
 прецизно за да се калибрира екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добредојдовте во Opie</translation>
+        <translation type="obsolete">Добредојдовте во Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/fifteen.ts b/i18n/mk/fifteen.ts
index 71dd058..01b23a1 100644
--- a/i18n/mk/fifteen.ts
+++ b/i18n/mk/fifteen.ts
@@ -1,42 +1,100 @@
 <!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/language.ts b/i18n/mk/language.ts
index 8f78801..d29525c 100644
--- a/i18n/mk/language.ts
+++ b/i18n/mk/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Англиски</translation>
     </message>
     <message>
         <source>default</source>
         <translation>основен</translation>
     </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Attention, all windows will be closed by changing the language
+without saving the Data.&lt;br&gt;&lt;br&gt;Go on?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language Settings</source>
         <translation>Подесувања за јазик</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Избери јазик</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libaboutapplet.ts b/i18n/mk/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/mk/libaboutapplet.ts
+++ b/i18n/mk/libaboutapplet.ts
@@ -1,73 +1,74 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</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>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libcardmonapplet.ts b/i18n/mk/libcardmonapplet.ts
index 62f10de..81f491d 100644
--- a/i18n/mk/libcardmonapplet.ts
+++ b/i18n/mk/libcardmonapplet.ts
@@ -8,34 +8,26 @@
     <message>
         <source>Eject card 0: %1</source>
         <translation>Исфрли картичка 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Исфрли картичка 1: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Грешка при исфрлањето на CF/PCMCIA картичката!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>грешка при исфрлање на SD/MMC картичка!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Нова картичка:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Исфрлена:</translation>
     </message>
-    <message>
-        <source>New card: SD/MMC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: SD/MMC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libmailwrapper.ts b/i18n/mk/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/mk/libmailwrapper.ts
+++ b/i18n/mk/libmailwrapper.ts
@@ -24,48 +24,52 @@
     <message>
         <source>Mailbox has no mails!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Server has no TLS support!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LoginDialogUI</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
@@ -97,48 +101,56 @@
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3wrapper</name>
     <message>
         <source>Mailbox contains %1 mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -199,48 +211,76 @@
     <message>
         <source>Transaction failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Starttls not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;%1&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP connection: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP tls: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login aborted - storing mail to localfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentification failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error sending mail: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>progressMailSend</name>
     <message>
         <source>%1 of %2 bytes send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index 043e420..27ff458 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -56,119 +56,89 @@
         <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>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>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>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>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>
@@ -570,48 +540,78 @@ and </source>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Одбери Време:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::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>
diff --git a/i18n/mk/libopiesecurity2.ts b/i18n/mk/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/mk/libopiesecurity2.ts
+++ b/i18n/mk/libopiesecurity2.ts
@@ -1,40 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MultiauthMainWindow</name>
+    <name>Opie::Security::MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SecOwnerDlg</name>
+    <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index 0ecc001..9bb42d0 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -56,120 +56,120 @@
         <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>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Диалог на датотеки</translation>
+        <translation type="unfinished">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Отвори</translation>
+        <translation type="unfinished">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Сними</translation>
+        <translation type="unfinished">Сними</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></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>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Стил</translation>
+        <translation type="unfinished">Стил</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Големина</translation>
+        <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Кафеавата лисица рипа преку мрзливото куче</translation>
+        <translation type="unfinished">Кафеавата лисица рипа преку мрзливото куче</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>
@@ -389,55 +389,85 @@ and </source>
         <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="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::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Стил</translation>
+    </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>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>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>Wireless Configuration</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>MAC</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;2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WlanInfo</name>
     <message>
-        <source>Interface Information</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>802.11b</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AP</source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
     <message>
-        <source>Noise</source>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WlanInfo</name>
+</context>
 </TS>
diff --git a/i18n/mk/minesweep.ts b/i18n/mk/minesweep.ts
index 2bc7ea2..162943d 100644
--- a/i18n/mk/minesweep.ts
+++ b/i18n/mk/minesweep.ts
@@ -1,33 +1,37 @@
 <!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>Лов на мини</translation>
+        <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/opiemail.ts b/i18n/mk/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/mk/opiemail.ts
+++ b/i18n/mk/opiemail.ts
@@ -53,48 +53,76 @@
     <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>No Receiver spezified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store message into drafts?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Attachments will not be stored in &quot;Draft&quot; folder&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
@@ -198,75 +226,79 @@
     <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>Use SSL</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>
@@ -282,85 +314,137 @@
         <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>
 </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>Enter a filter string here.
+Then hit &quot;get newsgroup list&quot; again and only groups starting 
+with that filter will be listet.</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>
+</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>
@@ -373,48 +457,60 @@
     <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>
@@ -424,83 +520,87 @@
     <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>
 </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 SSL</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>
@@ -591,93 +691,104 @@
     <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>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
 </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>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 215e490..03a9c0c 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -69,49 +69,49 @@
     <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="unfinished">Добредојде во Opie</translation>
+        <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>
@@ -153,52 +153,48 @@ Please charge the back-up battery.</source>
 </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>FirstUseBackground</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>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 868cdad..1c10578 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -37,53 +37,53 @@
         <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>Compare To:</source>
+        <source>error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>error</source>
+        <source>Compare:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Овој граф прикажува колку меморија се користи на оваа Flash картичка.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Овој граф прикажува колку простор има на дискот.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>