386 files changed, 9607 insertions, 2840 deletions

diff --git a/i18n/cz/aqpkg.ts b/i18n/cz/aqpkg.ts
index 85e0a63..cb2a1e0 100644
--- a/i18n/cz/aqpkg.ts
+++ b/i18n/cz/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/cz/backup.ts b/i18n/cz/backup.ts
index 7075aca..3a32e30 100644
--- a/i18n/cz/backup.ts
+++ b/i18n/cz/backup.ts
@@ -1,116 +1,136 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Backup and Restore... pracuje...</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Chyba od systému:</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Zálohování selhalo!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup and Restore.. Se nezdařilo !!</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Zálohování proběhlo úspěšně.</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup and Restore</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Prosím vyberte, co chcete obnovit.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Obnovení selhalo.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nemohu otevřít soubor: %1</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Obnovení proběhlo úspěšně.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Backup And Restore</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Zálohovat</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Uložit jako</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Zálohovat</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Obnovit</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Sloupec 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Obnovit</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Vyberte zdroj</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Aktualizovat seznam souborů</translation>
+        <translation type="obsolete">Aktualizovat seznam souborů</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Chybové informace</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Chybová zpráva:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/calibrate.ts b/i18n/cz/calibrate.ts
index 330c0f5..62f7162 100644
--- a/i18n/cz/calibrate.ts
+++ b/i18n/cz/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 type="unfinished">Pro kalibraci obrazovky ukazujte
 přesně na kříže.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Opie vás vítá</translation>
+        <translation type="obsolete">Opie vás vítá</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/fifteen.ts b/i18n/cz/fifteen.ts
index 9ab6802..eab5a56 100644
--- a/i18n/cz/fifteen.ts
+++ b/i18n/cz/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>Rozházet</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Vyřešit</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Hra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Patnáctka</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Patnáctka</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gratuluji!
 Vyhrál jsi hru!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>R&amp;ozházet kameny</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Resetovat kameny</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/language.ts b/i18n/cz/language.ts
index d83f40f..19c45f1 100644
--- a/i18n/cz/language.ts
+++ b/i18n/cz/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Angličtina</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Výchozí</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>Nastavení jazyka</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Vyberte jazyk</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libaboutapplet.ts b/i18n/cz/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/cz/libaboutapplet.ts
+++ b/i18n/cz/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/cz/libcardmonapplet.ts b/i18n/cz/libcardmonapplet.ts
index 565a13d..2ae5d3c 100644
--- a/i18n/cz/libcardmonapplet.ts
+++ b/i18n/cz/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Vysunout kartu SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Vysunout kartu0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Vysunout kartu1: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Vysunutí CF/PCMCIA karty selhalo!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Vysunutí SD/MMC karty selhalo!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nová karta:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Vysunuto:</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/cz/libmailwrapper.ts b/i18n/cz/libmailwrapper.ts
index 4bdf7b2..f3f3c5e 100644
--- a/i18n/cz/libmailwrapper.ts
+++ b/i18n/cz/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation>chyba připojení k imap serveru: %1</translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation>chyba přihlášení k imap serveru: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation>Schránka neobsahuje zprávy</translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation>Ve schránce je %1 zpráv</translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation>Chyba ztažení hlaviček: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation>Schránka neobsahuje zprávy!</translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation>chyba smazání zprávy: %s</translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation>Nelze vytvořit složku %1 pro uskladnění podsložek</translation>
     </message>
     <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation>chyba kopírování zpráv: %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>chyba kopírování zprávy: %1</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>Přihlášení</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>Schránka obsahuje %1 zpráv</translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation>Schránka existuje.</translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation>Nelze inicializovat složku</translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation>Nelze zapsat do složky zpráv</translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation>Nelze inicializovat schránku</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Nelze stáhnout zprávu %i</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Nelze smazat zprávu %1</translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation>Schránka neexistuje.</translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation>Nelze smazat schránku.</translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>Ve schránce je %1 zpráv</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Nelze stáhnout zprávu %i</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Nelze smazat zprávu %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Nelze zjistit stav</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>Schránka obsahuje %1 zpráv</translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation>Nelze inicializovat složku</translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation>Nelze smazat zprávu</translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation>Nelze zjistit informace o složce</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Nelze smazat zprávu %1</translation>
     </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation>Žádná chyba</translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation>Neočekávaný chybový kód</translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation>Služba není k dispozici</translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation>Chyba toku</translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation>gethostname() selhalo</translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation>Není implementováno</translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation>Chyba, akce se neprovedla</translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation>Data přesáhla velikost místa</translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation>Chyba při zpracovávání</translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation>Schránka není k dispozici</translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation>Jméno schránky není povoleno</translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation>Špatná sekvence příkazů</translation>
     </message>
     <message>
         <source>User not local</source>
         <translation>Uživatel není lokální</translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation>Transakce selhala</translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation>Chyba paměti</translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation>Připojení odmítnuto</translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation>Neznámý chybový kód</translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation>Zprávu nelze odeslat</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Zprávu z fronty nelze odeslat - přerušení</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>Bylo odesláno %1 z %2 bajtů</translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation>Odesílání zprávy %1 z %2</translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation>Odesílání zprávy</translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation>Průběh zprávy</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libopiepim2.ts b/i18n/cz/libopiepim2.ts
index 75847d1..0f10bb5 100644
--- a/i18n/cz/libopiepim2.ts
+++ b/i18n/cz/libopiepim2.ts
@@ -1,382 +1,352 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Tlačítko Kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Tlačítko Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Tlačítko záznam</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">otočení displeje</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Horní+Nahoru</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Horní+Vlevo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Tlačítko Akce</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Tlačítko Konec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Odstín:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturace:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Hodnota:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Červená:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zelená:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Modrá:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alfa kanál:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Výběr barvy</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Více</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Otevřít</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Uložit</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Jméno:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Velký</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Střední</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Malý</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Styl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Velikost</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Opakovat dle</translation>
@@ -448,384 +418,414 @@ and </source>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="obsolete">OTimePickerDialogBase</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Čas podání:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FileDialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Otevřít</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Uložit</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Velikost</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Soubory</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Všechny soubory</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorita:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nízká</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Velmi nízká</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postup:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Uzávěrka:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Výchozí Email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kancelář:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webová stránka práce:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobil do práce:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager do práce:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domácí webová stránka:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Soukromý mobil:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Všechny Emaily:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profese:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vedoucí:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Žena</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Pohlaví:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Manžel(ka):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Narozeniny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Výročí:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Děti:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Přezdívka:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Křestní jméno</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Příjmení</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>titul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Soubor jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Název práce</translation>
diff --git a/i18n/cz/libopiesecurity2.ts b/i18n/cz/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/cz/libopiesecurity2.ts
+++ b/i18n/cz/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/cz/libopieui2.ts b/i18n/cz/libopieui2.ts
index 0ffa57a..1765d08 100644
--- a/i18n/cz/libopieui2.ts
+++ b/i18n/cz/libopieui2.ts
@@ -1,654 +1,684 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Tlačítko Kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Tlačítko Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Tlačítko záznam</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">otočení displeje</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Horní+Nahoru</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Horní+Vlevo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Tlačítko Akce</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Tlačítko Konec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Odstín:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturace:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Hodnota:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Červená:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zelená:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Modrá:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alfa kanál:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Výběr barvy</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Více</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FileDialog</translation>
+        <translation type="unfinished">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Otevřít</translation>
+        <translation type="unfinished">Otevřít</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Uložit</translation>
+        <translation type="unfinished">Uložit</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Jméno:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Velký</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Střední</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Malý</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Styl</translation>
+        <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
+        <translation type="unfinished">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Jméno</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Čas podání:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">MIME typ</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FileDialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Otevřít</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Uložit</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Jméno:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Velikost</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Příliš žluťoučký kůň úpěl ďábelské ódy</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">Jméno</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Všechny soubory</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Popis:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorita:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Nízká</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Velmi nízká</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Postup:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Uzávěrka:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Výchozí Email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Kancelář:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Webová stránka práce:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Mobil do práce:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager do práce:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Domácí webová stránka:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Soukromý mobil:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Všechny Emaily:</translation>
     </message>
     <message>
diff --git a/i18n/cz/libwlan.ts b/i18n/cz/libwlan.ts
index a46605c..cbfddc8 100644
--- a/i18n/cz/libwlan.ts
+++ b/i18n/cz/libwlan.ts
@@ -1,148 +1,293 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Bezdrátová konfigurace</translation>
+        <translation type="obsolete">Bezdrátová konfigurace</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Hlavní</translation>
+        <translation type="obsolete">Hlavní</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>jakýkoliv</translation>
+        <translation type="obsolete">jakýkoliv</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastruktura</translation>
+        <translation type="obsolete">Infrastruktura</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Řízeno</translation>
+        <translation type="obsolete">Řízeno</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Režim</translation>
+        <translation type="obsolete">Režim</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Určete &amp;Access Point</translation>
+        <translation type="obsolete">Určete &amp;Access Point</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Určete &amp;kanál</translation>
+        <translation type="obsolete">Určete &amp;kanál</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Proskenovat okolí</translation>
+        <translation type="obsolete">Proskenovat okolí</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Kanál</translation>
+        <translation type="obsolete">Kanál</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Šifrování</translation>
+        <translation type="obsolete">Šifrování</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Zapnout šifrování</translation>
+        <translation type="obsolete">&amp;Zapnout šifrování</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>Nastavení &amp;klíčů</translation>
+        <translation type="obsolete">Nastavení &amp;klíčů</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Klíč &amp;1</translation>
+        <translation type="obsolete">Klíč &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Klíč &amp;2</translation>
+        <translation type="obsolete">Klíč &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Klíč &amp;3</translation>
+        <translation type="obsolete">Klíč &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Klíč &amp;4</translation>
+        <translation type="obsolete">Klíč &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Nezašifrované pakety</translation>
+        <translation type="obsolete">Nezašifrované pakety</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Akceptovat</translation>
+        <translation type="obsolete">&amp;Akceptovat</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Odmítnout</translation>
+        <translation type="obsolete">&amp;Odmítnout</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Hlavní</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Řízeno</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Režim</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Šifrování</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Zapnout šifrování</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">Nastavení &amp;klíčů</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Klíč &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Klíč &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Klíč &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Klíč &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Rychlost</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Kanál</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Stanice</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Šum</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Kvalita</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Signál</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Informace o rozhraní</translation>
+        <translation type="obsolete">Informace o rozhraní</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Kanál</translation>
+        <translation type="obsolete">Kanál</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Režim</translation>
+        <translation type="obsolete">Režim</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Stanice</translation>
+        <translation type="obsolete">Stanice</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Rychlost</translation>
+        <translation type="obsolete">Rychlost</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Kvalita</translation>
+        <translation type="obsolete">Kvalita</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Šum</translation>
+        <translation type="obsolete">Šum</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signál</translation>
+        <translation type="obsolete">Signál</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/minesweep.ts b/i18n/cz/minesweep.ts
index 8c985a2..631ab4b 100644
--- a/i18n/cz/minesweep.ts
+++ b/i18n/cz/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Vyhrál si!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Explodoval si!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Hledání min</translation>
+        <translation type="obsolete">Hledání min</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Začátečník</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Pokročilý</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Hra</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/opiemail.ts b/i18n/cz/opiemail.ts
index ad0b750..3c64992 100644
--- a/i18n/cz/opiemail.ts
+++ b/i18n/cz/opiemail.ts
@@ -1,690 +1,809 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Nelze vytvořit novou složku</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Chyba během vytváření&lt;br&gt;nové složky - přerušení.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>V adresáři nejsou žádné položky.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vyberte alespoň jednu položku adresáře.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Sběrač adres</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problém</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vytvořte nejdříve SMTP účet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vyberte soubor.&lt;/p&gt;</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">Ano</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Ne</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>Napsat zprávu</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>odeslat později</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>použít:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Odpovědět</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>Slepá kopie</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Podpis</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>Kopie</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Příloha</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Smazat soubor</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Přidat soubor</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Otázka</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete smazat vybraný účet?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vyberte účet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Konfigurovat účty</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Novinky</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Konfigurovat IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Používat SSL</translation>
+        <translation type="obsolete">Používat SSL</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Prefix</translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Použít zabezpečení:</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Napsat novou zprávu</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Odeslat zprávy ve frontě</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Ukázat/skrýt složky</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Upravit nastavení</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Konfigurovat účty</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Schránka</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Odesílatel</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</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>Konfigurovat NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Používat SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Používat přihlašování</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>Zadejte název adresáře</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Název adresáře:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Adresář obsahuje podadresáře</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Fronta vyprázdněna</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete smazat tuto zprávu? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Přečíst tuto zprávu</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Smazat tuto zprávu</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopírovat/Přesunout zprávu</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Nelze vytvořit nová složka</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Chyba během vytváření&lt;br&gt;nové složky - přerušení.&lt;/center&gt;</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>Konfigurace POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Použít zabezpečení:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Konfigurovat SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Používat SSL</translation>
+        <translation type="obsolete">Používat SSL</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Používat přihlašování</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Název účtu</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Název SMTP serveru</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Port SMTP serveru</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uživatel</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Použít zabezpečení:</translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Vyberte typ</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Vyberte typ účtu</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Okno nastavení</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Zobrazit zprávu</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Zobrazit jako Html</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Odeslat zprávy později (zůstanou v outboxu)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Applet na lištu</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Vypnout applet na liště</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Jak často zkoušet</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Blikat LED při příchodu nové zprávy</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Zahrát zvuk při příchodu nové zprávy</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TextLabel1</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Zobrazit Text</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Uložit přílohu</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Od</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Kopie</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Tělo zprávy ještě nebylo staženo, nemůžete zatím odpovídat.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Tělo zprávy ještě nebylo staženo, nemůžete zatím přesměrovávat.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete smazat tuto zprávu? &lt;br&gt;&lt;br&gt;</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>E-Mail podle %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Zpráva</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Odpověď</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Přesměrování</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Přílohy</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Ukázat Html</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Smazat zprávu</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Název souboru</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</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>Okno výběru cíle</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Uložit zprávy do&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Složka:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Účet:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Vytvořit novou složku</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Prefix se objeví sám, není třeba ho zadávat!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Přesunout zprávy</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/qpe.ts b/i18n/cz/qpe.ts
index e7d6c07..bfab94d 100644
--- a/i18n/cz/qpe.ts
+++ b/i18n/cz/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/cz/sysinfo.ts b/i18n/cz/sysinfo.ts
index f8471d6..4d9b981 100644
--- a/i18n/cz/sysinfo.ts
+++ b/i18n/cz/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Tento graf znázorňuje, kolik prostoru je momentálně využito na Compact Flash paměťové kartě.</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>Tento graf znázorňuje, kolik prostoru je momentálně využito na pevném disku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na Secure Digital paměťové kartě.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito v interní (flash) paměti na tomto zařízení.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na dočasném RAM disku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Zatížení CPU aplikacemi (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Zatížení CPU systémem (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Tato stránka ukazuje vytížení procesoru zařízení.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Tato stránka ukazuje, kolik RAM paměti je alokováno.
 Pamět je rozdělena do těchto kategorií:
 
 1. Použitá - paměť použitá systémem Opie a jinými běžícími aplikacemi.
 2. Buffery - dočasný prostor použitý pro zvýšení výkonu
 3. Cache - informace, které se nedávno použily, ale nebyly ještě uvolněny.
 4. Volná - paměť, která není momentálně ničím nevyužitá.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Celková paměť: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použitá (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffery (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Volná (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Celkový swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Použití#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Používá</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Toto je seznam modulů do jádra systému, které jsou momentálně nahrány.
 
 Klikněte a podržte na modulu, pokud se chcete dozvědět více, nebo modul uvolnit.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Zde vyberete příkaz a potom kliknete na tlačítko Poslat pro poslání příkazu vybranému modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Poslat</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Sem klikněte pro poslání vybraného příkazu modulu označenému výše.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Tato oblast zobrazuje detailní informace o tomto modulu.</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Opravdu chcete poslat %1 tomuto modulu?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Použito (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Volno (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Příkaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stav</translation>
diff --git a/i18n/da/aqpkg.ts b/i18n/da/aqpkg.ts
index c37a958..8035889 100644
--- a/i18n/da/aqpkg.ts
+++ b/i18n/da/aqpkg.ts
@@ -15,413 +15,415 @@
     <message>
         <source>Reading configuration...</source>
         <translation>Læser konfiguration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Afbryd</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Opgrader</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Geninstaller)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Opgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Ledig plads</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Afbryd</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Brugeren klikkede AFBRYD ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Process afbrudt ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished">Gem output</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informationsniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Kun fejl</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Almindelige meddelelser</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Oplysende meddelelser</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Meddelelser til fejlfinding</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished">Håndterer pakken %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Fjerner symbolske links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished">Laver symlinks til%1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished">Laver symlinks til %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Færdig</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Creating directory </source>
-        <translation>Opretter mappe</translation>
+        <translation type="obsolete">Opretter mappe</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Link fra %1 til %1 oprettet</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Link fra %1 til %1 oprettet</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>%1 fjernet</translation>
+        <translation type="obsolete">%1 fjernet</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Kunne ikke fjerne %1</translation>
+        <translation type="obsolete">Kunne ikke fjerne %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Fjernet</translation>
+        <translation type="obsolete">Fjernet</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to remove </source>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Indtast teksten du vil søge efter her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Opgradér</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Anvend ændringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis pakker der ikke er installeret</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis opdaterede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed, hvor en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrér efter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik her for at vise pakker tilhørende en bestemt kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Vælg filter kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik her for at ændre den kategori der skal bruges til filteret.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Find næste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump tastplade</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik her for at vælge et pakke feed.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dette er en liste over alle pakker fra det server feed der er valgt foroven.
 
 En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
 
 En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
 
 Klik inde i boksen til venstre for at vælge en pakke.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik her for at afinstallere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakke liste for:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Genopfrisker server pakke lister</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
diff --git a/i18n/da/backup.ts b/i18n/da/backup.ts
index ae724a1..8d96122 100644
--- a/i18n/da/backup.ts
+++ b/i18n/da/backup.ts
@@ -1,120 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Sikkerhedskopiering... arbejder...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Fejl! Der er ikke taget backup.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Backup gennemført.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Kunne ikke åbne filen %1</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiering</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programmer</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiering</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Gendan</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Vælg kilde</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Column 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Gendan</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Opdater fil-listen</translation>
+        <translation type="obsolete">Opdater fil-listen</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </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>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/calibrate.ts b/i18n/da/calibrate.ts
index 901d8d6..648b788 100644
--- a/i18n/da/calibrate.ts
+++ b/i18n/da/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>Tryk præcist og bestemt på krydsene
 for at kalibrere skærmen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Velkommen til Opie</translation>
+        <translation type="obsolete">Velkommen til Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/fifteen.ts b/i18n/da/fifteen.ts
index bd6996f..a540f3c 100644
--- a/i18n/da/fifteen.ts
+++ b/i18n/da/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>Bland</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Løs</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Femtenspillet</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Femtenspillet</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Tillykke!
 Du har vundet spillet!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Bl&amp;and stykkerne</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>Nulstil stykke&amp;rne</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/language.ts b/i18n/da/language.ts
index 0327ff2..9a74057 100644
--- a/i18n/da/language.ts
+++ b/i18n/da/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Engelsk</translation>
     </message>
     <message>
         <source>default</source>
         <translation>standard</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>Select language</source>
         <translation>Vælg sprog</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Sprog indstillinger</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libaboutapplet.ts b/i18n/da/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/da/libaboutapplet.ts
+++ b/i18n/da/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/da/libcardmonapplet.ts b/i18n/da/libcardmonapplet.ts
index d550ec2..399a7f4 100644
--- a/i18n/da/libcardmonapplet.ts
+++ b/i18n/da/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Skub SD/MMC kortet ud</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Skub kort 0 ud: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Skub kort 1 ud: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Udskubning af CF/PCMCIA kortet mislykkedes!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Udskubning af SD/MMC kortet mislykkedes!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nyt kort:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Skubbet ud: </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/da/libmailwrapper.ts b/i18n/da/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/da/libmailwrapper.ts
+++ b/i18n/da/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/da/libopiepim2.ts b/i18n/da/libopiepim2.ts
index 37cb611..2abb23e 100644
--- a/i18n/da/libopiepim2.ts
+++ b/i18n/da/libopiepim2.ts
@@ -1,318 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalender-knap</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontakter-knap</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menu-knap</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Post-knap</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Home-knap</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Optag-knap</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Roter skærmbillede</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rød:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grøn:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blå:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Vælg farve</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mere</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mere...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Åbn</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gem</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Navn:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Stor</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mellem</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Lille</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størrelse</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, og</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">på</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -370,384 +344,410 @@ og</translation>
         <translation type="obsolete">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut-dato</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, og</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">på</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Vælg tid:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Åbn</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Gem</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Størrelse</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Privat hjemmeside:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privat telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privat fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privat mobil-tlf:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle email-adresser:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Stilling:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Leder:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Bryllupsdag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Børn:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Slut:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notat:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenter</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Filer</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Alle filer</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
diff --git a/i18n/da/libopiesecurity2.ts b/i18n/da/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/da/libopiesecurity2.ts
+++ b/i18n/da/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/da/libopieui2.ts b/i18n/da/libopieui2.ts
index 963aaf9..70eba6e 100644
--- a/i18n/da/libopieui2.ts
+++ b/i18n/da/libopieui2.ts
@@ -1,583 +1,609 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalender-knap</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontakter-knap</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menu-knap</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Post-knap</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Home-knap</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Optag-knap</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Roter skærmbillede</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rød:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grøn:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blå:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Vælg farve</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mere</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mere...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Åbn</translation>
+        <translation type="unfinished">Åbn</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Gem</translation>
+        <translation type="unfinished">Gem</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Navn:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Stor</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mellem</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Lille</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Størrelse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>The Quick Brown Fox Jumps Over Lazy Dog</translation>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Navn</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut-dato</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, og</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">på</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Vælg tid:</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">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Åbn</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Gem</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Størrelse</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</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">Navn</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioritet:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Privat hjemmeside:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Privat telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Privat fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Privat mobil-tlf:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Alle email-adresser:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Stilling:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Leder:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Køn:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Ægtefælle:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Fødselsdag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Bryllupsdag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Børn:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notater:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Start:</translation>
     </message>
     <message>
diff --git a/i18n/da/libwlan.ts b/i18n/da/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/da/libwlan.ts
+++ b/i18n/da/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/da/minesweep.ts b/i18n/da/minesweep.ts
index 7b2edca..9319467 100644
--- a/i18n/da/minesweep.ts
+++ b/i18n/da/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Du vandt!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Du eksploderede!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Minestryger</translation>
+        <translation type="obsolete">Minestryger</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Begynder</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Ekspert</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/opiemail.ts b/i18n/da/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/da/opiemail.ts
+++ b/i18n/da/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index 1f19cf0..de67e85 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,373 +1,369 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 svarer ikke.&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;Ønsker du at tvinge programmet til at afslutte?&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">Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">Velkommen til Opie</translation>
+        <translation type="obsolete">Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenter</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Batteriet er næsten tomt.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">visitkort</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Batteristatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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">Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Finder dokumenter</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Søger dokumenter</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumenter</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokument visning</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Lyd</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Link programmer</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Begræns søgning til mappe: (ikke ibrug endnu)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Tilføj</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Lyd</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Tilføj</translation>
     </message>
diff --git a/i18n/da/sysinfo.ts b/i18n/da/sysinfo.ts
index eeb2116..8a82f26 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Compact Flash hukommelses kort.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget lager der iøjeblikket er i brug på denne harddisk.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Secure Digital hukommelses kort.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Program CPU forbrug (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU forbrug (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Denne side viser hvor meget af denne enheds processor er i brug.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Denne side viser hvor meget hukommelse (f.eks. RAM) der bliver allokeret på din håndholdte enhed.
 Hukommelse er kategoriseret som følgende:
 
 1. Brugt - hukommelse brugt af Opie og alle igangværende programmer.
 2. Buffer - midlertidigt lager brugt til at øge ydelsen.
 3. Cache - information der fornyelig har været brugt men ikke er blevet frigjort endnu.
 4. Fri - hukommelsen der iøjeblikket ikke er i brug af Opie eller andre igangværende programmer.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffere (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Hukommelse ialt: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Brug#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Brugt af</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dette er en liste af alle de kernel moduler der iøjeblikket er indlæst på denne håndholdte enhed.
 
 Klik og hold på et modul for at se yderligere information om modulet eller for at fjerne det.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Vælg en kommando her og klik på Send knappen til højre for at sende kommandoen til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik her for at sende den valgte kommando til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dette område viser detaljeret information om dette modul.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Vil du virkelig køre
 </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index 04a8337..fe9be8c 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -20,413 +20,427 @@
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Entfernen
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installieren
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualisieren
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Neuinstallation)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualisierung)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Verf. Speicher</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Starten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Benutzerabbruch ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Vorgang abgebrochen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Ausgabe speichern</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 kB</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>--force.depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informationslevel</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Nur Fehler</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale Meldungen</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informative Meldungen</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Ausgaben zur Fehlersuche</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation> Bearbeite Paket %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Löschen symbolischer Links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Erstellung symbolischer Links für %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Erstellung symbolischer Links für %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Erledigt</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Entfernen des Statuseintrags...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>Statusdatei -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>Paket-</translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Statusdatei konnte nicht geöffnet werden- </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Temp. Statusdatei konnte nicht geöffnet werden- </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>ipkg konnte nicoht gestartet werden</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Öffnen fehlgeschlagen: </translation>
+        <translation type="obsolete">Öffnen fehlgeschlagen: </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Erstellung Verzeichnis </translation>
+        <translation type="obsolete">Erstellung Verzeichnis </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Verlinkung von %1 mit %2</translation>
+        <translation type="obsolete">Verlinkung von %1 mit %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Verlinkung von %1 mit %2 fehlgeschlage</translation>
+        <translation type="obsolete">Verlinkung von %1 mit %2 fehlgeschlage</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>%1 gelöscht</translation>
+        <translation type="obsolete">%1 gelöscht</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Löschen %1 fehlgeschlagen</translation>
+        <translation type="obsolete">Löschen %1 fehlgeschlagen</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Gelöscht </translation>
+        <translation type="obsolete">Gelöscht </translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Löschen fehlgeschlagen </translation>
+        <translation type="obsolete">Löschen fehlgeschlagen </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg- der Paketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tippen Sie den Suchtext hier ein.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellleiste auszublenden.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Listen aktualisieren</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klicken Sie hier, um alle installierten Pakete zu aktualisieren, siofern eine neuere Version vorhanden ist.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Übernehmen</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klicken Sie hier, um das ausgewählte Paket zu löschen oder zu aktualisieren.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktion</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Nicht installierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klicken Sie hier um Pakete anzuzeigen, die nicht installiert wurden.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Installierte Pakete anzeigen</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Aktualisierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klicke Sie hier um nur installierte Pakete anzuzeigen, für die eine neuere Version verfügbar ist.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtern n. Kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klicken Sie hier um Pakete aufzulisten, die einer bestmmten Kategorie zugehören.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Filterkategorie setzen</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klicken Sie hier um die Paketkategorie in den verwendeten Filter zu übernehmen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Nächstes finden</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Alphabetische Schnellleiste</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellliste ein- und auszublenden.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Anzg.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server: </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klicken Sie hier, um einen Feedserver auszuwählen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakete</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dies ist eine Liste aller Pakete des oben gewählten Feed-Servers.
 Eine blaue Kugel neben dem Paketnamen zeigt an dass das Paket zur Zeit installiert ist.
 Ein blauer Punkt mit einem gelben Stern zeit dass eine neuere Version des Pakets auf dem Server verfügbar ist.
 Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klicken Sie hier um asgewählte Pakete zu entfernen</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Serverlistenerstellung: 
 <byte value="x9"/>%1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Paketlistenerstellung für:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aktualisierung der Paketliste</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>WARNUNG !!!
 Ein Upgrade während
 OPIE/Qtopia läuft ist
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index 4df9467..b8d5f8d 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -1,126 +1,146 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Sichern und Wiederherstellen... arbeitet ...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Fehler vom System:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Sicherung fehlgeschlagen!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Sichern und Wiederherstellen... Fehlgeschlagen!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Sichern erfolgreich.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Bitte wählen Sie etwas zum wiederherstellen.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Wiederherstellung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Folgende Datei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Wiederherstellung erfolgreich.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Sicherung erfolgreich.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Rückspielen erfolgreich.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sichern</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Speichern nach</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Quelle wählen</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Spalte 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Erneuere Dateiliste</translation>
+        <translation type="obsolete">Erneuere Dateiliste</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Fehler Information</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Fehler Meldung:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/calibrate.ts b/i18n/de/calibrate.ts
index e11338b..210a639 100644
--- a/i18n/de/calibrate.ts
+++ b/i18n/de/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>Berühren Sie das Kreuz so präsise wie
 möglich zum Kalibrieren des Bildschirms.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen in Opie</translation>
+        <translation type="obsolete">Willkommen in Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/fifteen.ts b/i18n/de/fifteen.ts
index 8b47951..c85cfd3 100644
--- a/i18n/de/fifteen.ts
+++ b/i18n/de/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>Verwirbeln</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Lösen</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Herzlichen Glückwunsch!
 Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Verwirbeln</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Teile zurücksetzen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index 73d75e3..2a00ad7 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -33,213 +33,217 @@
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Ruhmeshalle</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Mauscursor verstecken</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Graphisches Theme verstecken</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pause im Hintergrund</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Fortsetzen im Vordergrund</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>&amp;Tasten ändern ...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@-@VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 Ein Pacmanspiel für den KDE-Desktop
 
 Das Spiel basiert auf den Quellen von ksnake
 von Michel Filippi (mfilippi@sade.rhein-main.de)
 Das Design wurde stark beeinflusst durch Pacman
 (c) 1980 MIDWAY MFG.CO
 
 Ich danke meiner Freundin Elke Krueers für
 die letzten 10 Jahre Ihrer Freundschaft.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Der BitFont konnte nicht erstellt werden.
 
 Die Datei &apos;@FONTNAME@&apos; exisitiert nicht
 oder iist in einem unbekannten Format.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>GAME OVER</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>SPIELER 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>FERTIG!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>CHARAKTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SPITZNAME</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORTIERUNG: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>CURSOR DRÜCKEN ZUM STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>GRATULATION</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>SIE HABEN EINEN</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>PLATZ IN DER TOP10 ERREICHT.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNG   PKTE     NAME    DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Die Graphik konnte nicht aufgebaut werden.
 
 Die Datei &apos;@PIXMAPNAME@&apos; existiert nicht.
 oder ist in einem unbekannten Format.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initializierungsfehler</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/language.ts b/i18n/de/language.ts
index 4ef4e3a..a332ae2 100644
--- a/i18n/de/language.ts
+++ b/i18n/de/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Englisch</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Standard</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>Select language</source>
         <translation>Sprache auswählen</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Spracheinstellungen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index 15f11a4..e71c175 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -1,133 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>About Shortvut</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation>Über</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="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</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="obsolete">&lt;p&gt;(new line)
 Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; wird entwickelt und gewartet durch das Opie team, einem weltweiten Netzwerk aus Entwicklern, die sich der freien Software verschrieben haben.(new line)
 &lt;/p&gt;(new line)
 &lt;p&gt;(new line)
 Keine Gruppe, Organisation oder Firma kontrolliert den Opie-Quellcode. Jeder ist dazu eingeladen zum Code beizutragen.(new line)
 &lt;/p&gt;(new line)
 &lt;p&gt;(new line)
 Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; für weitere Infos zum Opie Projekt.(new line)
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autoren</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>&lt;p&gt;(new line)
+        <translation type="obsolete">&lt;p&gt;(new line)
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;(new line)
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Report</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>
         <translation type="obsolete">&lt;p&gt;Software ist immer verbesserungsfähig, und das Opie Team ist bereit dies zu tun. Dafür müssen Sie, der Anwender, uns,d em Opie Team, sagen, was besser zu machen ist oder was nicht funktioniert wie erwartet.&lt;/p&gt;(new line)
 &lt;p&gt;Das Open Palmtop Integrated Environment benutzt ein Bug Tracking System. Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt;, um Fehler zu melden.&lt;/p&gt;(new line)
 &lt;p&gt;Wenn Sie Verbesserungsvorschläge haben, sind Sie herzlich dazu eingeladen das Bug Tracking System zu benutzen um Ihren Wunsch einzubringen. Versichern Sie sich bitte den Grad des Wunsches als &quot;Feature&quot; festzulegen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Schließen  Sie sich an</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>
         <translation type="obsolete">&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
 &lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
 &lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</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>&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</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>&lt;p&gt;
 Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b wurde entwickelt durch das Opie-Team, ein weltweites Netzwerk aus Softwareentwicklern die sich der freien Software verbunden fühlen.
 &lt;/p&gt;
 &lt;p&gt;
 Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist willkommen zu Opie beizutragen.
 &lt;/p&gt;
 &lt;p&gt;Besuchen Sie &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; für weitere Informationen über Opie.
 &lt;/p&gt;</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>&lt;p&gt;Software ist immer verbesserungsfähig, und das Opie Team ist bereit dies zu tun. Dafür müssen Sie, der Anwender, uns,d em Opie Team, sagen, was besser zu machen ist oder was nicht funktioniert wie erwartet.&lt;/p&gt;(new line)
 &lt;p&gt;Das Open Palmtop Integrated Environment benutzt ein Bug Tracking System. Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt;, um Fehler zu melden.&lt;/p&gt;(new line)
 &lt;p&gt;Wenn Sie Verbesserungsvorschläge haben, sind Sie herzlich dazu eingeladen das Bug Tracking System zu benutzen um Ihren Wunsch einzubringen. Versichern Sie sich bitte den Grad des Wunsches als &quot;Feature&quot; festzulegen.&lt;/p&gt;</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>&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
 &lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
 &lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</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">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</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/de/libcardmonapplet.ts b/i18n/de/libcardmonapplet.ts
index 80cfa18..6ce62c6 100644
--- a/i18n/de/libcardmonapplet.ts
+++ b/i18n/de/libcardmonapplet.ts
@@ -1,42 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>CF/PCMCIA-Auswurf fehlgeschlagen</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>SF/MMC-Auswurf fehlgeschlagen</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Neue Karte:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Ausgeworfen:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>SD/MMC auswerfen</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Karte 0 auswerfen: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Karte 1 auswerfen: %1</translation>
     </message>
     <message>
         <source>New card: SD/MMC</source>
-        <translation>Neue Karte: SD / MMC</translation>
+        <translation type="obsolete">Neue Karte: SD / MMC</translation>
     </message>
     <message>
         <source>Ejected: SD/MMC</source>
-        <translation>Ausgeworfen: SD / MMC</translation>
+        <translation type="obsolete">Ausgeworfen: SD / MMC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index dbf7f33..0e8b3b6 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Kein Durchscheinen</translation>
+        <translation type="unfinished">Kein Durchscheinen</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>getüpfelte Hintergrundfarbe</translation>
+        <translation type="unfinished">getüpfelte Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>getüpfelte Buttonfarbe</translation>
+        <translation type="unfinished">getüpfelte Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Durchscheinend getüpfelt, Hintergrundfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Durchscheinend getüpfelt, Buttonfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Benutzerdef. Durchscheinen</translation>
+        <translation type="unfinished">Benutzerdef. Durchscheinen</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menüfarbe</translation>
+        <translation type="unfinished">Menüfarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished">Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished">Transparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menütext verwenden</translation>
+        <translation type="unfinished">Schattierten Menütext verwenden</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Flache Werkzeugleistenbuttons</translation>
+        <translation type="unfinished">Flache Werkzeugleistenbuttons</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>getüpfelter Kontrast</translation>
+        <translation type="unfinished">getüpfelter Kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Hoch perfomanter Liquid-Stil von Mosfet</translation>
+        <translation type="unfinished">Hoch perfomanter Liquid-Stil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmailwrapper.ts b/i18n/de/libmailwrapper.ts
index c2c0445..88848f5 100644
--- a/i18n/de/libmailwrapper.ts
+++ b/i18n/de/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation>Fehler bei Verbindung zu IMAP-Server %1</translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation>Error beim Einloggen in Server %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation>Postfach enthält keine Nachrichten</translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation>Postfach enthält %1 Nachrichten</translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation>Fehler beim Holen der Vorspänne: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation>Postfach enthält keine Nachrichten !</translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation>Fehler beim Löschen der Nachrich: %s</translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation>Kann Ordner %1 als übergeorndeten Ordern nicht erstellen</translation>
     </message>
     <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation>Fehler beim Kopieren von Nachrichten: %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>Fehler beim Kopieren einer Nachricht: %1</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>Login</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>NAchricht enthält %1 Nachricht(en)</translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation>Postfach existiert.</translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation>Fehler beim initialisieren des Ordners</translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation>Fehler beim Schreiben in Ordner</translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation>Fehler beim Initialisieren des Postfachs</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Fehler beim Holen von Nachricht %i</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fehler beim Löschen von Nachrichten %1</translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation>Postfach existiert nicht.</translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation>Fehler beim Löschen des Postfachs.</translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>Mailbox enthält %1 Nachricht(en)</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Fehler beim Holen von Nachricht %1</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fehler beim Löschen von Nachricht %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Fehler bei der Statusermittlung</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>Mailbox enthält %1 Nachricht(en)</translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation>Fehler beim Initialisieren von Ordner</translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation>Fehler beim Löschen einer Nachricht</translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation>Fehler beim Holen der Ordnerinformation</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fehler beim Löschen von Nachricht %1</translation>
     </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation>Kein Fehler</translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation>Unerwarteter Fehler</translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation>Dienst nicht verfügbar</translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation>Stream-fehler</translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation>Hostname konnte nicht ermittelt werden</translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation>Nicht implementiert</translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation>Fehler, Aktion nicht durchgeführt</translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation>Daten übersteigen Speicherallokierung</translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation>Fehler bei Verarbeitung</translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation>Postfach nicht verfügbar</translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation>Postdachname nicht erlaubt</translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation>Schlechte Kommandsequenz</translation>
     </message>
     <message>
         <source>User not local</source>
         <translation>Benutzer nicht lokal</translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation>Transaktion fehlgeschlagen</translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation>Speicherfehler</translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation>Verbindung abgewiesen</translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation>Unbekannter Fehler</translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation>Fehler beim Versenden</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Fehler beim Versenden der Warteschlange</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>%1 von %2 Bytes gesendet</translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation>Sende Nachricht %1 von %2</translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation>Nachricht wird versandt</translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation>Fortschritt der Nachricht</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
index b4d83e4..bc63ef5 100644
--- a/i18n/de/libopiepim2.ts
+++ b/i18n/de/libopiepim2.ts
@@ -1,375 +1,345 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalendarknopf</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontaktknopf</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menüknopf</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Bildschirm Rotierung</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hochgestellt +Links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mehr</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Dateidialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groß</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mittel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, and</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">an</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -439,384 +409,414 @@ und</translation>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, and</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">an</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Zeit auswählen:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Dateidialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Öffnen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Speichern</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Größe</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Geschäftspiepser: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Private Webseiten: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privates Telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privates Fax: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privates Handy: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ehepartner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinder: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 jeden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 jeden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Den %1 %1 of jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Ende:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notiz:</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumente</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Dateien</translation>
diff --git a/i18n/de/libopiesecurity2.ts b/i18n/de/libopiesecurity2.ts
index 96fa4e4..b52d8c9 100644
--- a/i18n/de/libopiesecurity2.ts
+++ b/i18n/de/libopiesecurity2.ts
@@ -1,41 +1,75 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation>Willkommen zum  Opie Multi-authentication Framework</translation>
+        <translation type="obsolete">Willkommen zum  Opie Multi-authentication Framework</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
-        <translation>Starte Anmeldungsplugins...</translation>
+        <translation type="obsolete">Starte Anmeldungsplugins...</translation>
     </message>
     <message>
         <source>Proceed...</source>
-        <translation>Weiter...</translation>
+        <translation type="obsolete">Weiter...</translation>
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation>Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
+        <translation type="obsolete">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
-        <translation>Glückwunsch! Die Anmeldung war erfolgreich.</translation>
+        <translation type="obsolete">Glückwunsch! Die Anmeldung war erfolgreich.</translation>
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation>Nicht genügend Anmeldungsschritte bestanden!</translation>
+        <translation type="obsolete">Nicht genügend Anmeldungsschritte bestanden!</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Security::MultiauthMainWindow</name>
+    <message>
+        <source>Welcome to Opie Multi-authentication Framework</source>
+        <translation type="unfinished">Willkommen zum  Opie Multi-authentication Framework</translation>
+    </message>
+    <message>
+        <source>Launching authentication plugins...</source>
+        <translation type="unfinished">Starte Anmeldungsplugins...</translation>
+    </message>
+    <message>
+        <source>Proceed...</source>
+        <translation type="unfinished">Weiter...</translation>
+    </message>
+    <message>
+        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <translation type="unfinished">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
+    </message>
+    <message>
+        <source>Congratulations! Your authentication has been successful.</source>
+        <translation type="unfinished">Glückwunsch! Die Anmeldung war erfolgreich.</translation>
+    </message>
+    <message>
+        <source>You have not succeeded enough authentication steps!</source>
+        <translation type="unfinished">Nicht genügend Anmeldungsschritte bestanden!</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>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">Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
+    </message>
+</context>
+<context>
     <name>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>Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
+        <translation type="obsolete">Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
index 275afd1..0dd7406 100644
--- a/i18n/de/libopieui2.ts
+++ b/i18n/de/libopieui2.ts
@@ -1,648 +1,678 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalendarknopf</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontaktknopf</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menüknopf</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Bildschirm Rotierung</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hochgestellt +Links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mehr</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Dateidialog</translation>
+        <translation type="unfinished">Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Öffnen</translation>
+        <translation type="unfinished">Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Speichern</translation>
+        <translation type="unfinished">Speichern</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groß</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mittel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+        <translation type="unfinished">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Name</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, and</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">an</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Zeit auswählen:</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">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Dateityp</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Dateidialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Öffnen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Speichern</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Name:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Größe</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</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">Name</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Geschäftspiepser: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Private Webseiten: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Privates Telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Privates Fax: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Privates Handy: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Alle Emails: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Ehepartner: </translation>
     </message>
     <message>
diff --git a/i18n/de/libwlan.ts b/i18n/de/libwlan.ts
index 3e75cdf..0558a4d 100644
--- a/i18n/de/libwlan.ts
+++ b/i18n/de/libwlan.ts
@@ -1,153 +1,298 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Wireless Configuration</translation>
+        <translation type="obsolete">Wireless Configuration</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESS-ID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>&amp;Accesspoint</translation>
+        <translation type="obsolete">&amp;Accesspoint</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>&amp;Channel</translation>
+        <translation type="obsolete">&amp;Channel</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>alles</translation>
+        <translation type="obsolete">alles</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastruktur</translation>
+        <translation type="obsolete">Infrastruktur</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Managed</translation>
+        <translation type="obsolete">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <translation type="obsolete">Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Verschlüsselung</translation>
+        <translation type="obsolete">&amp;Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Schlüssel</translation>
+        <translation type="obsolete">&amp;Schlüssel</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Schlüssel &amp;1</translation>
+        <translation type="obsolete">Schlüssel &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Schlüssel &amp;2</translation>
+        <translation type="obsolete">Schlüssel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Schlüssel &amp;3</translation>
+        <translation type="obsolete">Schlüssel &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Schlüssel &amp;4</translation>
+        <translation type="obsolete">Schlüssel &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Unverschlüsselte Pakete</translation>
+        <translation type="obsolete">Unverschlüsselte Pakete</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Akzeptieren</translation>
+        <translation type="obsolete">&amp;Akzeptieren</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;ZTurückweisen</translation>
+        <translation type="obsolete">&amp;ZTurückweisen</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Umgebung neu scannen</translation>
+        <translation type="obsolete">Umgebung neu scannen</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Chn</translation>
+        <translation type="obsolete">Chn</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Allgemein</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Modus</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESS-ID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">&amp;Schlüssel</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Schlüssel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Schlüssel &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Schlüssel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Schlüssel &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Rate</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">802.11b</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Station</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Störung</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Qualität</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Signal</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Schnittstelleninformation</translation>
+        <translation type="obsolete">Schnittstelleninformation</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Station</translation>
+        <translation type="obsolete">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Rate</translation>
+        <translation type="obsolete">Rate</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualität</translation>
+        <translation type="obsolete">Qualität</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Störung</translation>
+        <translation type="obsolete">Störung</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signal</translation>
+        <translation type="obsolete">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/minesweep.ts b/i18n/de/minesweep.ts
index 720d49d..fea18c8 100644
--- a/i18n/de/minesweep.ts
+++ b/i18n/de/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Gewonnen!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Explodiert!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Minenjagd</translation>
+        <translation type="obsolete">Minenjagd</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Anfänger</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Experte</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/opiemail.ts b/i18n/de/opiemail.ts
index 41940e6..7465f28 100644
--- a/i18n/de/opiemail.ts
+++ b/i18n/de/opiemail.ts
@@ -1,1030 +1,1141 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Reply</source>
         <translation type="obsolete">Antwort</translation>
     </message>
     <message>
         <source>Reply All</source>
         <translation type="obsolete">Antwort an alle</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
 </context>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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">Post</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished">Betreff</translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">An</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished">CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>CC</source>
         <translation type="obsolete">CC</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="obsolete">Betreff</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="obsolete">Abbrechen</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="obsolete">Zurücksetzen</translation>
     </message>
     <message>
         <source>Queue</source>
         <translation type="obsolete">Warteschlange</translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="obsolete">Senden</translation>
     </message>
     <message>
         <source>From:</source>
         <translation type="obsolete">Von:</translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="obsolete">An:</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Post</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Löschen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">Server</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>MailviewerApp</name>
     <message>
         <source>View</source>
         <translation type="obsolete">Ansicht</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="obsolete">Neue Mail</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="obsolete">Einstellungen</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="obsolete">Post</translation>
     </message>
     <message>
         <source>Mailboxes</source>
         <translation type="obsolete">Postfächer</translation>
     </message>
     <message>
         <source>Configure OpieMail</source>
         <translation type="obsolete">OpieMail anpassen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Post</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished">Einstellungen</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished">Betreff</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished">Absender</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</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">Port</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">Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newsgroup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get newsgroup list from server</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpieMailConfig</name>
     <message>
         <source>OpieMail Config</source>
         <translation type="obsolete">OpieMail Einstellungen</translation>
     </message>
     <message>
         <source>Folders</source>
         <translation type="obsolete">Ordner</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="obsolete">&amp;Hinzufügen</translation>
     </message>
     <message>
         <source>&amp;Modify</source>
         <translation type="obsolete">&amp;Bearbeiten</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>Folder name</source>
         <translation type="obsolete">Ordnername</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="obsolete">Identität</translation>
     </message>
     <message>
         <source>Transport</source>
         <translation type="obsolete">Versandart</translation>
     </message>
     <message>
         <source>Input</source>
         <translation type="obsolete">Posteingang</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Folder</source>
         <translation type="obsolete">Ordner</translation>
     </message>
     <message>
         <source>User</source>
         <translation type="obsolete">Benutzer</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">Server</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protokoll</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">Postausgang</translation>
     </message>
 </context>
 <context>
     <name>OpieMailConfigImpl</name>
     <message>
         <source>Delete mailbox</source>
         <translation type="obsolete">Mailbox löschen</translation>
     </message>
     <message>
         <source>Delete the mailbox?
 All mails will be deleted.</source>
         <translation type="obsolete">Soll die Mailbox gelöscht werden?
 Alle Mails werden entfernt.</translation>
     </message>
 </context>
 <context>
     <name>OpieMailFolder</name>
     <message>
         <source>OpieMail Folder Config</source>
         <translation type="obsolete">OpieMail Ordnereinstellungen</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Beschreibung:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
 <context>
     <name>OpieMailIdenty</name>
     <message>
         <source>OpieMail Identity - Config</source>
         <translation type="obsolete">OpieMail Identitätseinstellungen</translation>
     </message>
     <message>
         <source>Signature:</source>
         <translation type="obsolete">Signatur:</translation>
     </message>
     <message>
         <source>Identity:</source>
         <translation type="obsolete">Identität:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
     <message>
         <source>Organization:</source>
         <translation type="obsolete">Organisation:</translation>
     </message>
     <message>
         <source>EMail:</source>
         <translation type="obsolete">E-Mail:</translation>
     </message>
     <message>
         <source>Reply To</source>
         <translation type="obsolete">Antwort-Adresse</translation>
     </message>
     <message>
         <source>Use for sending</source>
         <translation type="obsolete">Zum Senden benutzen</translation>
     </message>
 </context>
 <context>
     <name>OpieMailInputConfig</name>
     <message>
         <source>OpieMailInput</source>
         <translation type="obsolete">OpieMail Posteingang</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">Server:</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protokoll</translation>
     </message>
     <message>
         <source>Destination Folder</source>
         <translation type="obsolete">Zielordner</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Benutzername:</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">Port</translation>
     </message>
     <message>
         <source>110</source>
         <translation type="obsolete">110</translation>
     </message>
     <message>
         <source>Enable intervall checking.</source>
         <translation type="obsolete">Regelmäßig überprüfen.</translation>
     </message>
     <message>
         <source>Check every:</source>
         <translation type="obsolete">Nach Mail sehen alle:</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="obsolete">Minuten</translation>
     </message>
     <message>
         <source>&amp;Delete mail from server when deleted local.</source>
         <translation type="obsolete">&amp;Lokal gelöschte Mails vom Server entfernen.</translation>
     </message>
     <message>
         <source>&amp;Keep Mail on Server</source>
         <translation type="obsolete">&amp;Mails auf dem Server lassen</translation>
     </message>
 </context>
 <context>
     <name>OpieMailOutputConfig</name>
     <message>
         <source>OpieMailOutPut</source>
         <translation type="obsolete">OpieMail Postausgang</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protokoll</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">Server:</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Benutzername:</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Server requires authentication</source>
         <translation type="obsolete">Server verlangt Authorisierung</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">Port</translation>
     </message>
     <message>
         <source>25</source>
         <translation type="obsolete">25</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">Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
 </context>
 <context>
     <name>QMailView</name>
     <message>
         <source>Subject</source>
         <translation type="obsolete">Betreff</translation>
     </message>
     <message>
         <source>To</source>
         <translation type="obsolete">An</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="obsolete">Absender</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>(Re)edit</source>
         <translation type="obsolete">Bearbeiten</translation>
     </message>
     <message>
         <source>Copy To</source>
         <translation type="obsolete">Kopieren nach</translation>
     </message>
     <message>
         <source>Move To</source>
         <translation type="obsolete">Verschieben nach</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">Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SplitterWidgetBase</name>
     <message>
         <source>Form1</source>
         <translation type="obsolete">Formular1</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished">Formular1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">An</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">Post</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished">Antwort</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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 89f4e59..90cdb4a 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -1,309 +1,309 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Zeit und Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persönliche Informationen</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DocTab</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Schnellladen wurde für diese Anwendung ausgeschaltet. Tippen sie lange auf das Anwendungssymbol, um es wieder anzuschalten.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; wurde mit Signalcode %2 beendet&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Anwendung beendet</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Anwendung nicht gefunden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte Anwendung &lt;b&gt;%1&lt;/b&gt; nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte die Anwendung %1 nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Clicken Sie das Fadenkreuz genau 
 mittig um das Display zu kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen zu Opie</translation>
+        <translation type="obsolete">Willkommen zu Opie</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batteriestatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Geringe Batteriestärke</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Zurück</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Weiter &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Berühren Sie den Bildschirm irgendwo, um weiter zu machen.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Bitte warten, lade %1 Einstellungen.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Bitte warten...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>ErstBenutzungsHintergrund</translation>
+        <translation type="obsolete">ErstBenutzungsHintergrund</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Fertig</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Als Text betrachten</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Finde Dokumente...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Symbol-Ansicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listenansicht</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Der Documentenreiter&lt;p&gt;wurde deaktiviert.&lt;p&gt;Verwenden Sie Einstellungen-&gt;Launcher-&gt;DocTab&lt;p&gt;zum reaktivieren.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle Typen</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Neues Speichermedium erkannt:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Was soll durchgeführt werden ?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Speichermedium konfigurieren. Die Änderungen werden erst nach Beeden dieser Anwendung und Auswerfen der Karte aktiv.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Medientypen</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation></translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <source>Text</source>
         <translation></translation>
     </message>
     <message>
         <source>Video</source>
         <translation></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Suche begrenzen auf:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Ganzes Medium scannen</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Dieses Medium immer überprüfen</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer Modus</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Qtopia neu starten</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Hilfe...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
 (%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Der Batteriestatus ist kritisch!
 Schließen Sie das Gerät schnellst 
 möglich an die Stromversorgung an!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Batterie nahezu erschöpft.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Die Ersatzbatterie ist schwach.
 Bitte laden Sie sie auf.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Visitenkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer  Modus</translation>
     </message>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 81c38ec..8cf215c 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -184,197 +184,197 @@ Access denied</source>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keine</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="obsolete">Neues Passwort eingeben</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="obsolete">Passwort erneut eingeben</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="obsolete">Sicherheitseinstellungen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">Passwort ändern</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="obsolete">Passwort löschen</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="obsolete">Passwort muss beim Starten 
 eingegeben werden</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="obsolete">Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="obsolete">Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keine</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="obsolete">&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
 sollte jemand unerwünscht Zugriff auf dieses 
 Gerät erhalten.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="obsolete">Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="obsolete">Automatisch einloggen</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Eintrag löschen</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Vorgaben herstellen</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Sync. Software auswählen</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index e4e6c8b..70f0f61 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -1,258 +1,258 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Dieser Graph zeigt an wieviel Speicher auf dieser CompactFlash-Karte verwendet wird.</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>Dieser Graph zeigt den auf dieser Festplatte verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Dieser Graph zeigt den auf dieser Secure Digital Memory Card verwendeten Speicher an.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Dieser Graph zeigt an, wie viel des eingebauten Speichers zur Zeit belegt wird.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Dieser Graph zeigt den von der RAM Disk verwendeten Speicher an.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU-Auslastung für Anwendungen (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systemauslastung (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt die Auslastung des Prozessors.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Gepufferter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gecached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Freier Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamter Speicher: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Diese Seite zeigt wieviel Speicher (z.B. RAM) auf dem Gerät momentan belegt ist.
 Speicher wird wie folgt unterteilt:
 1. Belegt - Speicher, der von Opie und laufenden Anwendungen belegt wird.
 2. Puffer - Temporärer Speicher um die Performanz zu steigern
 3. Gecached - Information die seit kurzem nicht mehr benutzt wird, aber noch nicht freigegeben wurde.
 4. Frei - Speicher, der nicht durch Opie oder Anwendungen belegt wird. </translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Benutzung#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Benutzt von</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ei nModul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wählen Sie einen Befehl und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt; um den Befehl auszuführen.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klicken Sie hier, um den Befehl an das Module zu senden.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen der Module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Möchten Sie den Befehl wirklich ausführen </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Benutzt von</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Sie wollen wirklich %1 für dieses Modul ausführen?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Verfügbar (%1 kB)</translation>
     </message>
diff --git a/i18n/dk/aqpkg.ts b/i18n/dk/aqpkg.ts
index 85e0a63..cb2a1e0 100644
--- a/i18n/dk/aqpkg.ts
+++ b/i18n/dk/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/dk/backup.ts b/i18n/dk/backup.ts
index 1f2ebda..75e23eb 100644
--- a/i18n/dk/backup.ts
+++ b/i18n/dk/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></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/dk/calibrate.ts b/i18n/dk/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/dk/calibrate.ts
+++ b/i18n/dk/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/dk/clock.ts b/i18n/dk/clock.ts
index 6ddbc2c..401926f 100644
--- a/i18n/dk/clock.ts
+++ b/i18n/dk/clock.ts
@@ -14,196 +14,193 @@
         <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>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-</context>
 </TS>
diff --git a/i18n/dk/fifteen.ts b/i18n/dk/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/dk/fifteen.ts
+++ b/i18n/dk/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/language.ts b/i18n/dk/language.ts
index 34e0346..1562400 100644
--- a/i18n/dk/language.ts
+++ b/i18n/dk/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libaboutapplet.ts b/i18n/dk/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/dk/libaboutapplet.ts
+++ b/i18n/dk/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/dk/libcardmonapplet.ts b/i18n/dk/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/dk/libcardmonapplet.ts
+++ b/i18n/dk/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/dk/libliquid.ts b/i18n/dk/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/dk/libliquid.ts
+++ b/i18n/dk/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libmailwrapper.ts b/i18n/dk/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/dk/libmailwrapper.ts
+++ b/i18n/dk/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/dk/libopiesecurity2.ts b/i18n/dk/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/dk/libopiesecurity2.ts
+++ b/i18n/dk/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/dk/libopieui2.ts b/i18n/dk/libopieui2.ts
index a40cb08..51a5983 100644
--- a/i18n/dk/libopieui2.ts
+++ b/i18n/dk/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libwlan.ts b/i18n/dk/libwlan.ts
index d7985ab..37fdc29 100644
--- a/i18n/dk/libwlan.ts
+++ b/i18n/dk/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AWLan</name>
     <message>
-        <source>any</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>SSID</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</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/dk/minesweep.ts b/i18n/dk/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/dk/minesweep.ts
+++ b/i18n/dk/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/opiemail.ts b/i18n/dk/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/dk/opiemail.ts
+++ b/i18n/dk/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/qpe.ts b/i18n/dk/qpe.ts
index e7d6c07..bfab94d 100644
--- a/i18n/dk/qpe.ts
+++ b/i18n/dk/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/dk/security.ts b/i18n/dk/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/dk/security.ts
+++ b/i18n/dk/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/sysinfo.ts b/i18n/dk/sysinfo.ts
index d021c96..1af3e2d 100644
--- a/i18n/dk/sysinfo.ts
+++ b/i18n/dk/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/aqpkg.ts b/i18n/en/aqpkg.ts
index 6db6ebe..af89d9f 100644
--- a/i18n/en/aqpkg.ts
+++ b/i18n/en/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/en/backup.ts b/i18n/en/backup.ts
index 784e2d0..25f4bf6 100644
--- a/i18n/en/backup.ts
+++ b/i18n/en/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></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/en/calibrate.ts b/i18n/en/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/en/calibrate.ts
+++ b/i18n/en/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/en/clock.ts b/i18n/en/clock.ts
index 6ddbc2c..401926f 100644
--- a/i18n/en/clock.ts
+++ b/i18n/en/clock.ts
@@ -14,196 +14,193 @@
         <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>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-</context>
 </TS>
diff --git a/i18n/en/fifteen.ts b/i18n/en/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/en/fifteen.ts
+++ b/i18n/en/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/language.ts b/i18n/en/language.ts
index 77c6cff..9eade6a 100644
--- a/i18n/en/language.ts
+++ b/i18n/en/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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>Select language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libaboutapplet.ts b/i18n/en/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/en/libaboutapplet.ts
+++ b/i18n/en/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/en/libcardmonapplet.ts b/i18n/en/libcardmonapplet.ts
index 243d4d2..441a701 100644
--- a/i18n/en/libcardmonapplet.ts
+++ b/i18n/en/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></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/en/libliquid.ts b/i18n/en/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/en/libliquid.ts
+++ b/i18n/en/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libmailwrapper.ts b/i18n/en/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/en/libmailwrapper.ts
+++ b/i18n/en/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/en/libopiesecurity2.ts b/i18n/en/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/en/libopiesecurity2.ts
+++ b/i18n/en/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/en/libopieui2.ts b/i18n/en/libopieui2.ts
index d311189..0f61518 100644
--- a/i18n/en/libopieui2.ts
+++ b/i18n/en/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libwlan.ts b/i18n/en/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/en/libwlan.ts
+++ b/i18n/en/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/en/minesweep.ts b/i18n/en/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/en/minesweep.ts
+++ b/i18n/en/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/opiemail.ts b/i18n/en/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/en/opiemail.ts
+++ b/i18n/en/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index e059e72..e4cc8e0 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/sysinfo.ts b/i18n/en/sysinfo.ts
index 63152d4..6100afb 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index ff7600b..08f2319 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -17,413 +17,427 @@
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Borrar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalar</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Reinstalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Renovar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Usuario pulsó ABORTAR ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proceso abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Guardar salida</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Salida de soluciones</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Tratando con el paquete %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Eliminando enlaces simbólicos...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Creando enlaces simbólicos para %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Creando enlaces simbólicos para %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Eliminando entrada de estado...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>fichero de estado - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paquete - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>No pude abrir fichero de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>No pude crear fichero temporal de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>No pude iniciar proceso ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>No pude abrir :</translation>
+        <translation type="obsolete">No pude abrir :</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Creando directorio </translation>
+        <translation type="obsolete">Creando directorio </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Enlazando %1 a %2</translation>
+        <translation type="obsolete">Enlazando %1 a %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Fallo al enlazar %1 a %2</translation>
+        <translation type="obsolete">Fallo al enlazar %1 a %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Eliminado %1</translation>
+        <translation type="obsolete">Eliminado %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Fallo al borrar %1</translation>
+        <translation type="obsolete">Fallo al borrar %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Eliminado </translation>
+        <translation type="obsolete">Eliminado </translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Fallo al borrar </translation>
+        <translation type="obsolete">Fallo al borrar </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoría</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Fijar categoría del filtro</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Refrescando listas de paquetes del servidor</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENCIÓN: ¡No se recomienda
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index 70d3389..6f28060 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -1,125 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Copiar y restaurar... trabajando...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Error del Sistema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>¡Copia fallida!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Copia y restauración.. ¡¡Falló!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Copia exitosa.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Por favor, seleccione algo a restaurar.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Restauración fallida.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Incapaz de abrir fichero: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Restauración exitosa.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Copia de seguridad</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Guardar en</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Copia de seguridad</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleccionar fuente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Columna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Actualizar lista ficheros</translation>
+        <translation type="obsolete">Actualizar lista ficheros</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Información de error</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Mensaje de error:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/calibrate.ts b/i18n/es/calibrate.ts
index 2626c86..d0f19a3 100644
--- a/i18n/es/calibrate.ts
+++ b/i18n/es/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>Pulse sobre las cruces firmemente y con
 pecisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/fifteen.ts b/i18n/es/fifteen.ts
index 36c0d12..e63a22e 100644
--- a/i18n/es/fifteen.ts
+++ b/i18n/es/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>Revolver</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Resolver</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>¡Enhorabuena!
 ¡Ganaste el juego!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>R&amp;evolver piezas</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Colocar piezas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/language.ts b/i18n/es/language.ts
index f35e0b3..f0a12b5 100644
--- a/i18n/es/language.ts
+++ b/i18n/es/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglés</translation>
     </message>
     <message>
         <source>default</source>
         <translation>predefinido</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>Select language</source>
         <translation>Seleccione idioma</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Configuración del Idioma</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/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/es/libcardmonapplet.ts b/i18n/es/libcardmonapplet.ts
index ecfbc47..87b7c2e 100644
--- a/i18n/es/libcardmonapplet.ts
+++ b/i18n/es/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>¡Fallo al expulsar tarjeta CF/PCMCIA!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>¡Fallo al expulsar tarjeta SD/MMC!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nueva tarjeta:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Expulsada:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Expulsar tarjeta SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Expulsar tarjeta 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Expulsar tarjeta 1: %1</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/es/libmailwrapper.ts b/i18n/es/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/es/libmailwrapper.ts
+++ b/i18n/es/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 57b1583..34e293e 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -1,374 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">en </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -438,384 +408,414 @@ y </translation>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Tomar hora:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Diálogo Fichero</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Guardar</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamaño</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
diff --git a/i18n/es/libopiesecurity2.ts b/i18n/es/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/es/libopiesecurity2.ts
+++ b/i18n/es/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/es/libopieui2.ts b/i18n/es/libopieui2.ts
index e3c754f..5e941f4 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -1,647 +1,677 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Diálogo Fichero</translation>
+        <translation type="unfinished">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation type="unfinished">Guardar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+        <translation type="unfinished">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nombre</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</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">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Diálogo Fichero</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Guardar</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamaño</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</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">Nombre</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Ayudante: </translation>
     </message>
     <message>
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/es/libwlan.ts
+++ b/i18n/es/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/es/minesweep.ts b/i18n/es/minesweep.ts
index 0046d87..3396887 100644
--- a/i18n/es/minesweep.ts
+++ b/i18n/es/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>¡Ganaste!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>¡Explotaste!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Busca Minas</translation>
+        <translation type="obsolete">Busca Minas</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Principiante</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Experto</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Nivel</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/es/opiemail.ts
+++ b/i18n/es/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index f24f7e3..03fda50 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,373 +1,369 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 no responde.&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;¿Quiere forzar la salida de la aplicación?&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">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Estado de la Batería</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Añadir</translation>
     </message>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 6e6e06f..4ff30e2 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact 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>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>En</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Seguro que quiere ejecutar
 </translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">¿Seguro que quiere ejecutar %1 para este módulo?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index 171a15b..1f73e7c 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -96,413 +96,427 @@
         <source>Upgrade
 </source>
         <translation>Mise à jour
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Réinstaller)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Mise à jour)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espace dispo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **  L&apos;utilisateur à annuler l&apos;opération **</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>** Processus annulé **</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Enregistrer la sortie</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlg</name>
     <message>
         <source>Options</source>
         <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="obsolete">Forcer les Dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="obsolete">Forcer la Réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="obsolete">Forcer la Suppression</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="obsolete">Forcer la Ré-écriture</translation>
     </message>
     <message>
         <source>Verbose WGet</source>
         <translation type="obsolete">WGet Verbeux</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="obsolete">OK</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forcer les dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forcer la réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forcer la suppression</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forcer la ré-écriture</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Niveau d&apos;information</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Erreurs seulement</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Messages normaux</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Messages d&apos;information</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problème rencontré</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Traitement du paquet %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Suppression des liens symboliques...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Création de liens symboliques pour %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Création de liens symboliques pour %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Suppression du statut...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>fichier statut - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paquet -</translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Impossible d&apos;ouvrir le fichier de statut -</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Impossible de créer le fichier temporaire de statut -</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Impossible de démarrer le processus ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Ouverture impossible de : </translation>
+        <translation type="obsolete">Ouverture impossible de : </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Création du répertoire</translation>
+        <translation type="obsolete">Création du répertoire</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Lien %1 sur %2</translation>
+        <translation type="obsolete">Lien %1 sur %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Erreur de création du lien de %1 vers %2</translation>
+        <translation type="obsolete">Erreur de création du lien de %1 vers %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Supprimé : %1</translation>
+        <translation type="obsolete">Supprimé : %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Suppression impossible de : %1</translation>
+        <translation type="obsolete">Suppression impossible de : %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Supprimé</translation>
+        <translation type="obsolete">Supprimé</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Suppression impossible</translation>
+        <translation type="obsolete">Suppression impossible</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestionnaire de Paquets</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tapez le texte à rechercher ici.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Cliquez ici pour cacher la Barre d&apos;Accès Rapide.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Mise à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Cliquez ici pour mettre les listes de paquets des serveurs à jour.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Mise à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Cliquez ici pour mettre à jour tous les paquets installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Cliquer ici pour télécharger le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Appliquer les modifications</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Cliquez ici pour installer, enlever ou mettre à jour le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Afficher les paquets non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Cliquez ici pour afficher les paquets non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Afficher les paquets installés</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Cliquez ici pour afficher les paquets installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Afficher les paquets mis à jour</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Cliquez ici pour afficher les paquets installés sur cet appareil et dont une version plus récente est disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrer par catégorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Cliquez ici pour afficher les paquets appartenant à une catégorie.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Définir le filtre par catégorie</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Cliquez ici pour changer la catégorie de paquets à utiliser comme filtre.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Cliquez ici pour rechercher un texte dans les noms de paquets.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Cliquez ici pour trouver le paquets suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Clavier Accès Rapide</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Cliquez ici pour afficher/cacher le clavier permettant le déplacement rapide dans la liste des paquets.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Cliquez ici pour configurer l&apos;application.</translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="obsolete">Aide</translation>
     </message>
     <message>
         <source>Click here for help.</source>
         <translation type="obsolete">Cliquez ici pour afficher l&apos;aide.</translation>
     </message>
     <message>
         <source>About</source>
         <translation type="obsolete">A Propos</translation>
     </message>
     <message>
         <source>Click here for software version information.</source>
         <translation type="obsolete">Cliquez ici pour les informations sur la version du logiciel.</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Cliquez ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveurs : </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Cliquez ici pour sélectionner un serveur de paquets.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquets</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Voici la liste de tous les paquets disponibles sur le serveur sélectionné.
 
 Un point bleu signifie que le paquet est déjà installé sur cet appareil.
 
 Un point bleu avec une étoile signifie que le paquet est déjà installé, mais que la version du serveur est plus récente.
 
 Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
         <source>About AQPkg</source>
         <translation type="obsolete">A propos de AQPkg</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Cliquez ici pour désinstaller le(s) paquet(s) sélectionné(s).</translation>
     </message>
diff --git a/i18n/fr/backup.ts b/i18n/fr/backup.ts
index d22c496..e6f16e2 100644
--- a/i18n/fr/backup.ts
+++ b/i18n/fr/backup.ts
@@ -1,128 +1,148 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Sauvegarde/Restauration... en cours...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sauvegarde/Restauration</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Erreur système :
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Echec sauvegarde !</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Sauvegarde/Restauration.. Echec !!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Sauvegarde Effectuée.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Veuillez sélectionner un élément
 à restaurer.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Echec de restauration.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Impossible d&apos;ouvrir fichier :
 %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Restauration effectuée.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Sauvegarde effectuée avec succès.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Restauration effectuée avec succès.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sauvegarde/Restauration</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sauvegarde</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sauvegarder</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restauration</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Sélectionner une source</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonne 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurer</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Rafraichir la liste des fichiers</translation>
+        <translation type="obsolete">Rafraichir la liste des fichiers</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Info erreur</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Message d&apos;erreur : </translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/calibrate.ts b/i18n/fr/calibrate.ts
index d758b1b..98acd69 100644
--- a/i18n/fr/calibrate.ts
+++ b/i18n/fr/calibrate.ts
@@ -1,16 +1,16 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez sur la croix fermement et 
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenue sur Opie</translation>
+        <translation type="obsolete">Bienvenue sur Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/fifteen.ts b/i18n/fr/fifteen.ts
index 171e459..c11aaf0 100644
--- a/i18n/fr/fifteen.ts
+++ b/i18n/fr/fifteen.ts
@@ -1,43 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Mélanger</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Résoudre</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Pièces</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Pièces</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Bravo !
 Vous avez gagné !</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Mélanger les pièces</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Initialiser</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/language.ts b/i18n/fr/language.ts
index 9a88cf9..a7925ad 100644
--- a/i18n/fr/language.ts
+++ b/i18n/fr/language.ts
@@ -1,25 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Anglais</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Défaut</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>Select language</source>
         <translation>Sélectionnez une langue</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Langue</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libaboutapplet.ts b/i18n/fr/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/fr/libaboutapplet.ts
+++ b/i18n/fr/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/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index 841aa5a..2a1dda5 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -1,42 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Echec de l&apos;éjection de la carte CF/PCMCIA !</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Echec de l&apos;éjection de la carte SD/MMC !</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nouvelle carte : </translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Ejecté : </translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Ejection de la carte SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Ejecter la carte 0 : %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Ejecter la carte 1 : %1</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/fr/libmailwrapper.ts b/i18n/fr/libmailwrapper.ts
index b67b99a..9687fb3 100644
--- a/i18n/fr/libmailwrapper.ts
+++ b/i18n/fr/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation>erreur lors de la connexion au server imap : %1</translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation>erreur lors de la connexion au server imap : %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation>La boîte aux lettres est vide</translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation>%1 message(s) dans la boîte aux lettres</translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation>Erreur lors du traitement de l&apos;entête : %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation>La boîte au lettre est vide !</translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation>erreur lors de la suppression du message : %s</translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation>Impossible de créer le répertoire %1 pour contenir d&apos;autre sous-répertoires</translation>
     </message>
     <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation>erreur de copie du message : %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>erreur de copie des messages : %1</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>Connexion</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>%1 message(s) dans la boîte aux lettres</translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation>La boîte aux lettres existe.</translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation>Erreur d&apos;initialisation du répertoire</translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation>Erreur lors de l&apos;écriture dans le dossier des messages</translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation>Erreur d&apos;initialisation de mbox</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Erreur lors du rapatriment du message %1</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Erreur lors de la suppression du message %1</translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation>La boîte aux lettres n&apos;existe pas.</translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation>Erreur lors de la suppression de la boîte aux lettres.</translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>%1 message(s) dans la boîte aux lettres</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Erreur lors du rapatriment du message %1</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Erreur lors de la suppression du message %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Erreur du récupération du status</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>La boîte aux lettres contient %1 message(s)</translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation>Erreur lors de l&apos;initialisation du répertoire</translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation>erreur lors de la suppression du message</translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation>Erreur lors de la récupération d&apos;information sur le répertoire</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Erreur lors de la suppression du message %1</translation>
     </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation>Pas d&apos;erreur</translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation>Code d&apos;erreur inattendu</translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation>Service non disponible</translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation>Erreur de flux</translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation>Echec de gethostname()</translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation>Non implémenté</translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation>Erreur, action non supportée</translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation>Les données excèdent l&apos;espace de stockage</translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation>Erreur de traitement</translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation>Boîte aux lettres inaccessible</translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation>Nom de boîte aux lettres incorrecte</translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation>Mauvaise suite de commandes</translation>
     </message>
     <message>
         <source>User not local</source>
         <translation>Utilisateur non local</translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation>Echec de transaction</translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation>Erreur mémoire</translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation>Connexion refusée</translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation>Code d&apos;erreur inconnu</translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation>Erreur lors de l&apos;envoie du message</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Erreur lors de l&apos;envoie de la file de message - arrêt</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>%1 bytes envoyés sur %2</translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation>Envoie du message %1 sur %2</translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation>Envoie message</translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation>Progression message</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopiepim2.ts b/i18n/fr/libopiepim2.ts
index 57d626d..b89575c 100644
--- a/i18n/fr/libopiepim2.ts
+++ b/i18n/fr/libopiepim2.ts
@@ -1,387 +1,357 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Bouton Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Bouton E-mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotation écran</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Maj-Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Maj-Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Maj-Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Maj-Gauche</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Bouton Fin</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Nuance:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val : </translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alpha : </translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Sélectionner couleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ajouter...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Sélection fichier</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Ouvrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Enregistrer</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom : </translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Moyenne</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Petite</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Style</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation>Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -455,384 +425,414 @@ et </translation>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">A l&apos;infini</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">années</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">année</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Choisir heure : </translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="obsolete">OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Sélection fichier</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Ouvrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Enregistrer</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Style</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Taille</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Tous fichiers</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Très faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail par défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Alphapage (bur.):</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso.):</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>E-mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Cet événement couvre
 toute la journée</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Cet événement couvre
 plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Début : </translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Note : </translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 chaque</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Le %1 chaque</translation>
     </message>
     <message>
diff --git a/i18n/fr/libopiesecurity2.ts b/i18n/fr/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/fr/libopiesecurity2.ts
+++ b/i18n/fr/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/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
index eca489b..bb36c35 100644
--- a/i18n/fr/libopieui2.ts
+++ b/i18n/fr/libopieui2.ts
@@ -1,719 +1,749 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Bouton Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Bouton E-mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotation écran</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Maj-Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Maj-Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Maj-Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Maj-Gauche</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Bouton Fin</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Nuance:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val : </translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alpha : </translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Sélectionner couleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ajouter...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Sélection fichier</translation>
+        <translation type="unfinished">Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Ouvrir</translation>
+        <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Enregistrer</translation>
+        <translation type="unfinished">Enregistrer</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom : </translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Moyenne</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Petite</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Style</translation>
+        <translation type="unfinished">Style</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Le renard brun saute au dessus du chien paresseux</translation>
+        <translation type="unfinished">Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Configurer clé</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Dessin</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Touche</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Touche par défaut</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Raccourci pour l&apos;action séléctionnée</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">&amp;Aucun</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">&amp;Défaut</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Personnalisé</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Configurer touche</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">Défaut : </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">La touche est dans la liste noire</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="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Touche déjà assignée</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="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sans</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">A l&apos;infini</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">années</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">année</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Choisir heure : </translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Type mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Sélection fichier</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Ouvrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Enregistrer</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Style</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Taille</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</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">Dessin</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Touche</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Touche par défaut</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Raccourci pour l&apos;action séléctionnée</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">&amp;Aucun</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">&amp;Défaut</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Personnalisé</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Défaut : </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">La touche est dans la liste noire</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">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Touche déjà assignée</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">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tous fichiers</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Très faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail par défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Alphapage (bur.):</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Mobile (perso.):</translation>
     </message>
     <message>
diff --git a/i18n/fr/libwlan.ts b/i18n/fr/libwlan.ts
index bfa8a7c..908d3e3 100644
--- a/i18n/fr/libwlan.ts
+++ b/i18n/fr/libwlan.ts
@@ -1,152 +1,297 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Conf. liaison sans Fil</translation>
+        <translation type="obsolete">Conf. liaison sans Fil</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Mode</translation>
+        <translation type="obsolete">Mode</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESS-ID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Spécifier point d&apos;&amp;accès</translation>
+        <translation type="obsolete">Spécifier point d&apos;&amp;accès</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Spécifier &amp;canal</translation>
+        <translation type="obsolete">Spécifier &amp;canal</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>any</translation>
+        <translation type="obsolete">any</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastructure</translation>
+        <translation type="obsolete">Infrastructure</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Managed</translation>
+        <translation type="obsolete">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Sécurité</translation>
+        <translation type="obsolete">Sécurité</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Activer le cryptage</translation>
+        <translation type="obsolete">&amp;Activer le cryptage</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>Configurer &amp;clé</translation>
+        <translation type="obsolete">Configurer &amp;clé</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Clé &amp;1</translation>
+        <translation type="obsolete">Clé &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Clé &amp;2</translation>
+        <translation type="obsolete">Clé &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Clé &amp;3</translation>
+        <translation type="obsolete">Clé &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Clé &amp;4</translation>
+        <translation type="obsolete">Clé &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Paquets non-cryptés</translation>
+        <translation type="obsolete">Paquets non-cryptés</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Accepter</translation>
+        <translation type="obsolete">&amp;Accepter</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Rejeter</translation>
+        <translation type="obsolete">&amp;Rejeter</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Rescanner</translation>
+        <translation type="obsolete">Rescanner</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Canal</translation>
+        <translation type="obsolete">Canal</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Général</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESS-ID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Sécurité</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Activer le cryptage</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">Configurer &amp;clé</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Clé &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Clé &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Clé &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Clé &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Vitesse</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Canal</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Station</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Bruit</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Qualité</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Signal</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Information interface</translation>
+        <translation type="obsolete">Information interface</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Canal</translation>
+        <translation type="obsolete">Canal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Mode</translation>
+        <translation type="obsolete">Mode</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Station</translation>
+        <translation type="obsolete">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Vitesse</translation>
+        <translation type="obsolete">Vitesse</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualité</translation>
+        <translation type="obsolete">Qualité</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Bruit</translation>
+        <translation type="obsolete">Bruit</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signal</translation>
+        <translation type="obsolete">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/minesweep.ts b/i18n/fr/minesweep.ts
index d713673..c6d1e4e 100644
--- a/i18n/fr/minesweep.ts
+++ b/i18n/fr/minesweep.ts
@@ -1,34 +1,38 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Vous avez gagné !</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Vous avez explosé !</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Démineur</translation>
+        <translation type="obsolete">Démineur</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Débutant</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Confirmé</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/opiemail.ts b/i18n/fr/opiemail.ts
index d02a206..2ee9cac 100644
--- a/i18n/fr/opiemail.ts
+++ b/i18n/fr/opiemail.ts
@@ -1,1035 +1,1154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Reply</source>
         <translation type="obsolete">Répondre</translation>
     </message>
     <message>
         <source>Reply All</source>
         <translation type="obsolete">Répondre à Tous</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Supprimer</translation>
     </message>
 </context>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Erreur de création du répertoire</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Erreur lors de la création du répertoire - arrêt&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Aucun contact dans la liste d&apos;adresse.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vous devez sélectionner au moins une adresse.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Ajout d&apos;adresse</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problème</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il vous faut créer au moins un compte SMTP.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sélectionnez un fichier.&lt;/p&gt;</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">Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Non</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>Composer un message</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>envoyer plus tard</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>utiliser : </translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Répondre à</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>Cci</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Signature</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Attachement</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Supprimer fichier</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Ajouter fichier</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Form1</source>
         <translation type="obsolete">Formulaire1</translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="obsolete">CC</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="obsolete">Objet</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="obsolete">Annuler</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="obsolete">Réinitialiser</translation>
     </message>
     <message>
         <source>Queue</source>
         <translation type="obsolete">File d&apos;Attente</translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="obsolete">Envoyer</translation>
     </message>
     <message>
         <source>From:</source>
         <translation type="obsolete">De:</translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="obsolete">A:</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Question</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Confirmez vous la suppression de ce compte ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Veuillez sélectionner un compte.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Config. comptes</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Nouvelles</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Config. IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Utiliser SSL</translation>
+        <translation type="obsolete">Utiliser SSL</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Préfixe</translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Utiliser sockets sécurisées :</translation>
+    </message>
 </context>
 <context>
     <name>MailviewerApp</name>
     <message>
         <source>View</source>
         <translation type="obsolete">Affichage</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="obsolete">Composer</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="obsolete">Configurations</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="obsolete">Message</translation>
     </message>
     <message>
         <source>Mailboxes</source>
         <translation type="obsolete">Boîtes aux Lettres</translation>
     </message>
     <message>
         <source>Configure OpieMail</source>
         <translation type="obsolete">Configurer OpieMail</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Composer un nouveau message</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Envoyer e-mails en attentes</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Afficher/Cacher répertoires</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Editer paramètres</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Configurer comptes</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Boîte aux lettres</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Objet</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Expéditeur</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</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>Config. NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Utiliser SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Nécéssite un connexion</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>Entrez un nom de répertoire</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Nom de répertoire : </translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Les répertoires peuvent contenir d&apos;autre répertoires</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Boîte d&apos;envoie vidée</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Confirmez vous la suppression de ce message ? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Lire ce message</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Supprimer ce message</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Copier/Déplacer ce message</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Erreur de création du répertoire</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Erreur lors de la création&lt;br&gt;du répertoire - arrêt.&lt;/center&gt;</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>OpieMailConfig</name>
     <message>
         <source>OpieMail Config</source>
         <translation type="obsolete">Config OpieMail</translation>
     </message>
     <message>
         <source>Folders</source>
         <translation type="obsolete">Répertoires</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="obsolete">&amp;Ajouter</translation>
     </message>
     <message>
         <source>&amp;Modify</source>
         <translation type="obsolete">&amp;Modifier</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation type="obsolete">&amp;Supprimer</translation>
     </message>
     <message>
         <source>Folder name</source>
         <translation type="obsolete">Nom répertoire</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="obsolete">Indentité</translation>
     </message>
     <message>
         <source>Transport</source>
         <translation type="obsolete">Transport</translation>
     </message>
     <message>
         <source>Input</source>
         <translation type="obsolete">Entrée</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Folder</source>
         <translation type="obsolete">Répertoire</translation>
     </message>
     <message>
         <source>User</source>
         <translation type="obsolete">Utilisateur</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">Serveur</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protocole</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">Sortie</translation>
     </message>
 </context>
 <context>
     <name>OpieMailConfigImpl</name>
     <message>
         <source>Delete mailbox</source>
         <translation type="obsolete">Supprimer boîte aux lettres</translation>
     </message>
     <message>
         <source>Delete the mailbox?
 All mails will be deleted.</source>
         <translation type="obsolete">Supprimer la boîte aux lettres ?
 Tous les messages seront détruits.</translation>
     </message>
 </context>
 <context>
     <name>OpieMailFolder</name>
     <message>
         <source>OpieMail Folder Config</source>
         <translation type="obsolete">Config Répertoire OpieMail</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Description :</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom :</translation>
     </message>
 </context>
 <context>
     <name>OpieMailIdenty</name>
     <message>
         <source>OpieMail Identity - Config</source>
         <translation type="obsolete">Config - Identité OpieMail</translation>
     </message>
     <message>
         <source>Signature:</source>
         <translation type="obsolete">Signature :</translation>
     </message>
     <message>
         <source>Identity:</source>
         <translation type="obsolete">Identité :</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>Organization:</source>
         <translation type="obsolete">Organisation :</translation>
     </message>
     <message>
         <source>EMail:</source>
         <translation type="obsolete">E-Mail :</translation>
     </message>
     <message>
         <source>Reply To</source>
         <translation type="obsolete">Répondre à</translation>
     </message>
     <message>
         <source>Use for sending</source>
         <translation type="obsolete">Utiliser pour répondre</translation>
     </message>
 </context>
 <context>
     <name>OpieMailInputConfig</name>
     <message>
         <source>OpieMailInput</source>
         <translation type="obsolete">Entrée OpieMail</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">Serveur :</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protocole</translation>
     </message>
     <message>
         <source>Destination Folder</source>
         <translation type="obsolete">Répertoire de Destination</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Nom Utilisateur :</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">Mot de Passe</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">Port</translation>
     </message>
     <message>
         <source>110</source>
         <translation type="obsolete">110</translation>
     </message>
     <message>
         <source>Enable intervall checking.</source>
         <translation type="obsolete">Vérification par intervalle.</translation>
     </message>
     <message>
         <source>Check every:</source>
         <translation type="obsolete">Vérifier chaque :</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="obsolete">minutes</translation>
     </message>
     <message>
         <source>&amp;Delete mail from server when deleted local.</source>
         <translation type="obsolete">&amp;Détruire sur le serveur les messages supprimés en local.</translation>
     </message>
     <message>
         <source>&amp;Keep Mail on Server</source>
         <translation type="obsolete">&amp;Conserver les Messages sur le Serveur</translation>
     </message>
 </context>
 <context>
     <name>OpieMailOutputConfig</name>
     <message>
         <source>OpieMailOutPut</source>
         <translation type="obsolete">Sortie OpieMail</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">Protocole</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">Serveur :</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">Nom Utilisateur :</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">Mot de Passe</translation>
     </message>
     <message>
         <source>Server requires authentication</source>
         <translation type="obsolete">Le serveur requière une authentification</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">Port</translation>
     </message>
     <message>
         <source>25</source>
         <translation type="obsolete">25</translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Config. POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Utiliser sockets sécurisées :</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
 </context>
 <context>
     <name>QMailView</name>
     <message>
         <source>Subject</source>
         <translation type="obsolete">Objet</translation>
     </message>
     <message>
         <source>To</source>
         <translation type="obsolete">A</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="obsolete">Expéditeur</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>(Re)edit</source>
         <translation type="obsolete">(Re)éditer</translation>
     </message>
     <message>
         <source>Copy To</source>
         <translation type="obsolete">Copier Dans</translation>
     </message>
     <message>
         <source>Move To</source>
         <translation type="obsolete">Déplacer Vers</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Config. SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Utiliser SSL</translation>
+        <translation type="obsolete">Utiliser SSL</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Nécéssite un connexion</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Nom du serveur SMTP</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Port SMTP serveur</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Utiliser sockets sécurisées :</translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Sélectionner type</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Sélectionner le type de compte</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Paramètres</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Afficher message</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Afficher message en HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Enregistrer message dans la boîte d&apos;envoie</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Applet de la barre des tâches</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Désactiver l&apos;applet</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Interval de vérification</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Faire clignoter le led lors de l&apos;arrivé
 de nouveaux messages</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Signal sonore lors de l&apos;arrivé
 d&apos;un nouveau message</translation>
     </message>
 </context>
 <context>
     <name>SplitterWidgetBase</name>
     <message>
         <source>Form1</source>
         <translation type="obsolete">Formulaire1</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TextLabel1</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Afficher texte</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Enregistrer attachement</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Le corp du message n&apos;est pas encore rapatrié. Vous ne pouvez pas y répondre.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Le corp du message n&apos;est pas encore rapatrié. Vous ne pouvez pas le faire suivre.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Confirmez vous la suppression de ce message ? &lt;br&gt;&lt;br&gt;</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>E-mail par %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Faire suivre</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Attachements</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Afficher HTML</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Supprimer message</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Nom fichier</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</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>Sélection de la cible</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;enregistrer message(s) dans&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Répertoire : </translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Compte : </translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Créer répertoire</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Le préfixe sera ajouter, vous n&apos;avez pas besoin de le saisir !</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Déplacer message(s)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 288ad5e..2e0a0ad 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,372 +1,372 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Heure et date</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Information personnelle</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Onglet Document</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;application à quitter ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Le chargement rapide a été désactivé pour cette application. Cliquez et maintenez la pression sur l&apos;icône pour la réactiver.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; a été terminée par le signal %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Application terminée</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Application non trouvée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problème de l&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 ne répond pas.&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;Voulez-vous forcer l&apos;application à quitter?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez sur la croix fermement et
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenue sur Opie</translation>
+        <translation type="obsolete">Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Vue Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Le niveau de batterie est très bas.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">business card</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Status batterie</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Batterie faible</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Précédent</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Suivant &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Cliquez sur l&apos;écran pour continuer.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Chargement de la configuration de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>Premier arriere plan</translation>
+        <translation type="obsolete">Premier arriere plan</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Terminer</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanceur</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ouvrir avec l&apos;éditeur de texte</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Recherche documents...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;L&apos;onglet Documents&lt;p&gt;a été désactivé.&lt;p&gt;Utilisez Paramètres-&gt;Lanceur-&gt;Onglet Document&lt;p&gt;pour le réactiver.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">Fichiers %1</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Tous types</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Nouveau média de stockage détecté : </translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Que dois faire le programme ?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouru à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vidéo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Lier apps</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limiter la recherche au répertoire: (pas encore utilisé)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Configure le média. Les modifications prendront effet lorsque vous quitterez cette application. Pour mettre à jour l&apos;onglet Document, vous devrez enlever et réinsérer le média.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limiter la recherche à : </translation>
     </message>
     <message>
         <source>Add</source>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index a7bf0c7..0009b72 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -1,260 +1,264 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Cette zone affiche les tests disponibles, les résultats pour chaque tests et les comparaisons de leurs valeurs avec l&apos;appareil témoin sélectionné. Utilisez les cases à cocher pour définir le test que vous voulez réaliser.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Comparaison</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Calcul sur entier</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Calcul en virgule flottante</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Affichage de texte</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Affichage d&apos;image</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Performance de la ram</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Performance carte SD</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Performance carte CF</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Démarrer les tests !</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Cliquez ici pour démarrer les tests sélectionnés.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Sélectionnez un modèle d&apos;appareil pour réaliser les comparaisons.</translation>
     </message>
     <message>
         <source>Compare To:</source>
-        <translation>Comparer avec : </translation>
+        <translation type="obsolete">Comparer avec : </translation>
     </message>
     <message>
         <source>error</source>
         <translation>Erreur</translation>
     </message>
+    <message>
+        <source>Compare:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Compact 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>Ce graphe représente la quantité de mémoire actuellement utilisée sur ce disque dur.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur cette carte mémoire Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée dans la mémoire centrale (i.e. mémoire Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ce graphe représente la quantité de mémoire actuellement utilisée sur le dique RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilisation du processeur par
 les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation du processeur par
 le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page montre la charge du processeur.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 ko)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 ko)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire Totale : %1 Ko</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Cette page montre l&apos;utilisation de la mémoire par votre PDA.
 La mémoire est divisée en catégories comme suit :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Cette page affiche la quantité de mémoire (i.e RAM) utilisée par votre appareil.
 Cette quantité mémoire est découpée en plusieurs catégories :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Swap Total : %1 Ko</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Utilisé#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Utilisé par</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Voici la liste de tous les modules chargés sur cet assistant personnel.
 
 Cliquez et maintenez appuyer pour voir les informations à propos du module ou pour le décharger.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Sélectionnez une commande puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer la commande au module sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Cliquez ici pour envoyer la commande sélectionné au module sélectionné.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Cette zone décrit en détail les informations au sujet de ce module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Voulez-vous vraiment exécuter
 
 </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Utilisé par</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Vous désirez vraiment exécuter %1 pour ce module ?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Confirmez vous l&apos;execution de
 %1 pour ce module ?</translation>
     </message>
 </context>
diff --git a/i18n/hu/aqpkg.ts b/i18n/hu/aqpkg.ts
index 6db6ebe..af89d9f 100644
--- a/i18n/hu/aqpkg.ts
+++ b/i18n/hu/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/hu/backup.ts b/i18n/hu/backup.ts
index 784e2d0..25f4bf6 100644
--- a/i18n/hu/backup.ts
+++ b/i18n/hu/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></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/hu/calibrate.ts b/i18n/hu/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/hu/calibrate.ts
+++ b/i18n/hu/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/hu/fifteen.ts b/i18n/hu/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/hu/fifteen.ts
+++ b/i18n/hu/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/language.ts b/i18n/hu/language.ts
index c116a5f..fe1e88e 100644
--- a/i18n/hu/language.ts
+++ b/i18n/hu/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Magyar</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Alapértelmezett</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>Select language</source>
         <translation>Válassza ki a nyelvet</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Nyelv beállítása</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libaboutapplet.ts b/i18n/hu/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/hu/libaboutapplet.ts
+++ b/i18n/hu/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/hu/libcardmonapplet.ts b/i18n/hu/libcardmonapplet.ts
index 243d4d2..441a701 100644
--- a/i18n/hu/libcardmonapplet.ts
+++ b/i18n/hu/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></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/hu/libliquid.ts b/i18n/hu/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/hu/libliquid.ts
+++ b/i18n/hu/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libmailwrapper.ts b/i18n/hu/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/hu/libmailwrapper.ts
+++ b/i18n/hu/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/hu/libopiesecurity2.ts b/i18n/hu/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/hu/libopiesecurity2.ts
+++ b/i18n/hu/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/hu/libopieui2.ts b/i18n/hu/libopieui2.ts
index d3a67c3..96b23f6 100644
--- a/i18n/hu/libopieui2.ts
+++ b/i18n/hu/libopieui2.ts
@@ -1,214 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nincs</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">HétVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Va</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Nap</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Minden</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Válasszon időt:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
diff --git a/i18n/hu/libwlan.ts b/i18n/hu/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/hu/libwlan.ts
+++ b/i18n/hu/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/hu/minesweep.ts b/i18n/hu/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/hu/minesweep.ts
+++ b/i18n/hu/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/opiemail.ts b/i18n/hu/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/hu/opiemail.ts
+++ b/i18n/hu/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index 482dd0f..ace565b 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,373 +1,369 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 nem válaszol.&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;Akarja, hogy bezárjam az alkalmazást?&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">Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">Üdvözli önt az Opie</translation>
+        <translation type="obsolete">Üdvözli önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumentumok</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Listanézet</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Az elem kezd kimerülni.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">névjegykártya</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Elem állapot</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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">Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumentumok</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Listanézet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokumentum nézet</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Hang</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Videó</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Csatold az alkalmazásokat</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Keresés korlátozása a könyvtárra: (még nem használt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Hozzáad</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Hang</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Minden</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Videó</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Hozzáad</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/sysinfo.ts b/i18n/hu/sysinfo.ts
index 948523e..10b1b3e 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Compact Flash memóriakártyán.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi tárhely van felhasználva ezen merevlemezen.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Secure Digital memóriakártyán.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva a beépített (Flash) memóriából ezen az kéziszámítógépen.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva az ideiglenes RAM diszken.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Alkalmazás CPU használat (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Rendszer CPU használat (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Átmeneti tár (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gyorsítótár (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Szabad (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Teljes memória: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Ez a lap megmutatja, a memória (azaz RAM) hogyan van felosztva az ön kéziszámítógépében.
 A memória az alábbiak szerint van kategoruzálva:
 
 1. Felhasznált - az Opie és más futó alkalmazások által felhasznált memória.
 2. Átmeneti tár - ideiglenes tároló a teljesítmény növeléséhez.
 3. Gyorsítótár - nemrég használt, de még fel nem szabadított információk.
 4. Szabad - az Opie vagy más futó alkalmazás által fel nem használt memória.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Használat#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Használja</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ez a lista a kernelbe jelenleg betöltött modulokat mutatja.
 
 Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modulról vagy eltávolítsa azt.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Válasszon ki itt egy parancsot és bökjön a jobboldali Küld gombra, hogy a parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Bökjön ide, hogy a kiválasztott parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ez a terület részletes információkat mutat erről a modulról.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Tényleg futtatni akarja
 </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Elérhető (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
diff --git a/i18n/it/aqpkg.ts b/i18n/it/aqpkg.ts
index d660a3f..5d5030d 100644
--- a/i18n/it/aqpkg.ts
+++ b/i18n/it/aqpkg.ts
@@ -20,413 +20,427 @@
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Elimina
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installa
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Upgrade
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Rinstalla)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Upgrade)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Spazio Disp.</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** L&apos;utente ha premuto INTERROMPI ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Processo Interrotto ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Salva output</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forza Sovrascrittura</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Livello Informazioni</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Solo errori</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Messaggi normali</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Messaggi informativi</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Output troubleshooting</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Trattamento pacchetto %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Rimozione link simbolici...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Creazione link simbolici per %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Creazione link simbolici per %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminato</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Rimozione valore stato...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>file di stato - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pacchetto - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Impossibile aprire file di stato - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Impossibile creare file di stato temporaneo - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Impossibile avviare processo ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Impossibile aprire :</translation>
+        <translation type="obsolete">Impossibile aprire :</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Creazione directory </translation>
+        <translation type="obsolete">Creazione directory </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Creato link da %1 a %2</translation>
+        <translation type="obsolete">Creato link da %1 a %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Creazione link da %1 a %2 fallita</translation>
+        <translation type="obsolete">Creazione link da %1 a %2 fallita</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Eliminato %1</translation>
+        <translation type="obsolete">Eliminato %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Impossibile eliminare %1</translation>
+        <translation type="obsolete">Impossibile eliminare %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Eliminato </translation>
+        <translation type="obsolete">Eliminato </translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Impossibile eliminare </translation>
+        <translation type="obsolete">Impossibile eliminare </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Inserisci qui il testo da cercare.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Premi qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Premi qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Premi qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Applica modifiche</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Premi qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostra pacchetti non installati</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Premi qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostra pacchetti installati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostra pacchetti aggiornati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtra per categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Premi qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Imposta filtro per categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Premi qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Premi qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trova successivo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Premi qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Tastiera Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Premi qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Premi qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Premi qui per selezionare un server per i pacchetti.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacchetti</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Questa è la lista di tutti i pacchetti del server selezionato sopra.
 
 Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
 
 Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
 
 Premi dentro il box sulla sinistra per selezionare un pacchetto.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Premi qui per disinstallare i pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista server:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista pacchetti per:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Aggiornamento liste pacchetti dal server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENZIONE: Fare l&apos;upgrade
diff --git a/i18n/it/backup.ts b/i18n/it/backup.ts
index b8d4400..c71740f 100644
--- a/i18n/it/backup.ts
+++ b/i18n/it/backup.ts
@@ -1,126 +1,146 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Backup e Restore... in corso...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup e Restore</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Errore dal Sistema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Backup Fallito!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup e Restore... Fallito !!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Backup Eseguito.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Seleziona qualcosa da restorare.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Restore Fallito.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Impossibile aprire File: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Restore Eseguito.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Backup e Restore</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Salva Su</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restore</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleziona Sorgente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restore</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Aggiorna Lista File</translation>
+        <translation type="obsolete">Aggiorna Lista File</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Info Errore</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Messaggio di Errore:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/calibrate.ts b/i18n/it/calibrate.ts
index 2cdba64..93e6c73 100644
--- a/i18n/it/calibrate.ts
+++ b/i18n/it/calibrate.ts
@@ -1,16 +1,16 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tocca le crocette accuratamente e
 con decisione per calibrare lo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Benvenuto in Opie</translation>
+        <translation type="obsolete">Benvenuto in Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/fifteen.ts b/i18n/it/fifteen.ts
index 7f9e8ac..c3cd912 100644
--- a/i18n/it/fifteen.ts
+++ b/i18n/it/fifteen.ts
@@ -1,43 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Randomizza</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Risolvi</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Partita</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Gioco del 15</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Gioco del 15</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Congratulazioni!
 Hai vinto la partita!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>R&amp;andomizza Pezzi</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reset Pezzi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/language.ts b/i18n/it/language.ts
index 257570c..7edf419 100644
--- a/i18n/it/language.ts
+++ b/i18n/it/language.ts
@@ -1,25 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglese</translation>
     </message>
     <message>
         <source>default</source>
         <translation>predefinito</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>Select language</source>
         <translation>Seleziona lingua</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Impostazioni Lingua</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libaboutapplet.ts b/i18n/it/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/it/libaboutapplet.ts
+++ b/i18n/it/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/it/libcardmonapplet.ts b/i18n/it/libcardmonapplet.ts
index 5acf20b..15bde80 100644
--- a/i18n/it/libcardmonapplet.ts
+++ b/i18n/it/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Eject card SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Eject card 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Eject card 1: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Eject card CF/PCMCIA fallito!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Eject catd SD/MMC fallito!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nuova card:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Eject:</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/it/libmailwrapper.ts b/i18n/it/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/it/libmailwrapper.ts
+++ b/i18n/it/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/it/libopiepim2.ts b/i18n/it/libopiepim2.ts
index e099ecf..35195eb 100644
--- a/i18n/it/libopiepim2.ts
+++ b/i18n/it/libopiepim2.ts
@@ -1,375 +1,345 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Pulsante Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Pulsante ontatti</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Pulsante Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Pulsante Posta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Pulsante Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Pulsante Registrazione</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotazione Display</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Basso+Sù</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Basso+Giù</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Basso+Destra</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Basso+Sinistra</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Alto+Sù</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Alto+Giù</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Alto+Destra</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Alto+Sinistra</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ancora</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Apri</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salva</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Medio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Piccolo</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stile</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">su</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -439,384 +409,414 @@ e </translation>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Su</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Il</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">su</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Scegli l&apos;Orario:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FileDialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Apri</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Salva</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stile</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Dimensione</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Email Principale: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Tutte le Email: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Figli: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inizio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fine:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Ogni </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">File</translation>
diff --git a/i18n/it/libopiesecurity2.ts b/i18n/it/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/it/libopiesecurity2.ts
+++ b/i18n/it/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/it/libopieui2.ts b/i18n/it/libopieui2.ts
index 5816733..d83df65 100644
--- a/i18n/it/libopieui2.ts
+++ b/i18n/it/libopieui2.ts
@@ -1,648 +1,678 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Pulsante Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Pulsante ontatti</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Pulsante Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Pulsante Posta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Pulsante Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Pulsante Registrazione</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotazione Display</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Basso+Sù</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Basso+Giù</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Basso+Destra</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Basso+Sinistra</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Alto+Sù</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Alto+Giù</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Alto+Destra</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Alto+Sinistra</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ancora</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FileDialog</translation>
+        <translation type="unfinished">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Apri</translation>
+        <translation type="unfinished">Apri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Salva</translation>
+        <translation type="unfinished">Salva</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Medio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Piccolo</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stile</translation>
+        <translation type="unfinished">Stile</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Dimensione</translation>
+        <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
+        <translation type="unfinished">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Su</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Il</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">su</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Scegli l&apos;Orario:</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">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FileDialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Apri</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Salva</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stile</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Dimensione</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</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">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Anniversario: </translation>
     </message>
     <message>
diff --git a/i18n/it/libwlan.ts b/i18n/it/libwlan.ts
index a8269f8..7624024 100644
--- a/i18n/it/libwlan.ts
+++ b/i18n/it/libwlan.ts
@@ -1,153 +1,286 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Configurazione Wireless</translation>
+        <translation type="obsolete">Configurazione Wireless</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Generale</translation>
+        <translation type="obsolete">Generale</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modalità</translation>
+        <translation type="obsolete">Modalità</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESS-ID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Specifica &amp;Access Point</translation>
+        <translation type="obsolete">Specifica &amp;Access Point</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Specifica &amp;Canale</translation>
+        <translation type="obsolete">Specifica &amp;Canale</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>tutti</translation>
+        <translation type="obsolete">tutti</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastruttura</translation>
+        <translation type="obsolete">Infrastruttura</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Gestista</translation>
+        <translation type="obsolete">Gestista</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Crittografia</translation>
+        <translation type="obsolete">Crittografia</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Abilita Crittografia</translation>
+        <translation type="obsolete">&amp;Abilita Crittografia</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Impostazioni Chiave</translation>
+        <translation type="obsolete">&amp;Impostazioni Chiave</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Chiave &amp;1</translation>
+        <translation type="obsolete">Chiave &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Chiave &amp;2</translation>
+        <translation type="obsolete">Chiave &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Chiave &amp;3</translation>
+        <translation type="obsolete">Chiave &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Chiave &amp;4</translation>
+        <translation type="obsolete">Chiave &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Pacchetti non criptati</translation>
+        <translation type="obsolete">Pacchetti non criptati</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Accetta</translation>
+        <translation type="obsolete">&amp;Accetta</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Rifiuta</translation>
+        <translation type="obsolete">&amp;Rifiuta</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Generale</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Gestista</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Mode</source>
+        <translation type="unfinished">Modalità</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESS-ID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Abilita Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">&amp;Impostazioni Chiave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Chiave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Chiave &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Chiave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Chiave &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Frequenza</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Canale</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Stazione</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Rumore</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Qualità</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Segnale</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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>
     <message>
         <source>Interface Information</source>
-        <translation>Informazioni Interfaccia</translation>
+        <translation type="obsolete">Informazioni Interfaccia</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Canale</translation>
+        <translation type="obsolete">Canale</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modalità</translation>
+        <translation type="obsolete">Modalità</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Stazione</translation>
+        <translation type="obsolete">Stazione</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Frequenza</translation>
+        <translation type="obsolete">Frequenza</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualità</translation>
+        <translation type="obsolete">Qualità</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Rumore</translation>
+        <translation type="obsolete">Rumore</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Segnale</translation>
+        <translation type="obsolete">Segnale</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/minesweep.ts b/i18n/it/minesweep.ts
index cbc6ab0..1683f47 100644
--- a/i18n/it/minesweep.ts
+++ b/i18n/it/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Hai vinto!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Sei esploso!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Campo Minato</translation>
+        <translation type="obsolete">Campo Minato</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Principiante</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Intermedio</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Esperto</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Livello</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/opiemail.ts b/i18n/it/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/it/opiemail.ts
+++ b/i18n/it/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index 6383080..6a6b350 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,374 +1,370 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 non risponde.&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;Vuoi forzare l&apos;applicazione ad uscire?&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">Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">Benvenuto in Opie</translation>
+        <translation type="obsolete">Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Mostra Lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Stato Batteria</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documenti</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Mostra Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Mostra Documento</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Tutti</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Link applicazioni</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Aggiungi</translation>
     </message>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index f1ea2aa..18383fc 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -1,258 +1,258 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Questo grafico rappresenta quanta memoria di questa scheda Compact Flash è attualmente utilizzata.</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>Questo grafico rappresenta quanto spazio di questo disco rigido è attualmente utilizzato.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Questo grafico rappresenta quanta memoria di questa scheda Secure Digital è attualmente utilizzata.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Questo grafico rappresenta quanta memoria interna (es. memoria Flash) è attualmente utilizzata su questo dispositivo portatile.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Questo grafico rappresenta quanta memoria del disco RAM è attualmente utilizzata.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilizzo CPU applicazione (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilizzo CPU sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libera (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria Totale: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Questa pagina mostra quanta memoria (es. RAM) è stata allocata su questo dispositivo portatile.
 La memoria è divisa come segue:
 
 1. Usata - memoria utilizzata da Opie e da qualunque altra applicazione in esecuzione.
 2. Buffer - spazio temporaneo utilizzato per aumentare le prestazioni
 3. Cached - informazioni che sono state utilizzate recentemente, ma che non sono ancora state liberate.
 4. Libera - memoria non ancora utilizzata da Opie o da qualunque altra applicazione.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usato Da</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Questa è una lista di tutti i moduli del kernel attualmente caricati su questo dispositivo portatile.
 
 Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per scaricarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selezionare qui un comando e premere il pulsante Invia sulla destra per inviare il comando al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Premere qui per inviare il comando selezionato al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo modulo.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Vuoi veramente eseguire
 </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Utilizzato da</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Eseguire veramente %1 per questo modulo?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
diff --git a/i18n/ja/aqpkg.ts b/i18n/ja/aqpkg.ts
index 85e0a63..cb2a1e0 100644
--- a/i18n/ja/aqpkg.ts
+++ b/i18n/ja/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/ja/backup.ts b/i18n/ja/backup.ts
index 1f2ebda..75e23eb 100644
--- a/i18n/ja/backup.ts
+++ b/i18n/ja/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></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/ja/calibrate.ts b/i18n/ja/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/ja/calibrate.ts
+++ b/i18n/ja/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ja/clock.ts b/i18n/ja/clock.ts
index 6ddbc2c..401926f 100644
--- a/i18n/ja/clock.ts
+++ b/i18n/ja/clock.ts
@@ -14,196 +14,193 @@
         <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>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-</context>
 </TS>
diff --git a/i18n/ja/fifteen.ts b/i18n/ja/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/ja/fifteen.ts
+++ b/i18n/ja/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/language.ts b/i18n/ja/language.ts
index 34e0346..1562400 100644
--- a/i18n/ja/language.ts
+++ b/i18n/ja/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libaboutapplet.ts b/i18n/ja/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/ja/libaboutapplet.ts
+++ b/i18n/ja/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/ja/libcardmonapplet.ts b/i18n/ja/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/ja/libcardmonapplet.ts
+++ b/i18n/ja/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/ja/libliquid.ts b/i18n/ja/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/ja/libliquid.ts
+++ b/i18n/ja/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libmailwrapper.ts b/i18n/ja/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/ja/libmailwrapper.ts
+++ b/i18n/ja/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/ja/libopiesecurity2.ts b/i18n/ja/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/ja/libopiesecurity2.ts
+++ b/i18n/ja/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/ja/libopieui2.ts b/i18n/ja/libopieui2.ts
index a40cb08..51a5983 100644
--- a/i18n/ja/libopieui2.ts
+++ b/i18n/ja/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libwlan.ts b/i18n/ja/libwlan.ts
index d7985ab..37fdc29 100644
--- a/i18n/ja/libwlan.ts
+++ b/i18n/ja/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AWLan</name>
     <message>
-        <source>any</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>SSID</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</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/ja/minesweep.ts b/i18n/ja/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/ja/minesweep.ts
+++ b/i18n/ja/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/opiemail.ts b/i18n/ja/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/ja/opiemail.ts
+++ b/i18n/ja/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/qpe.ts b/i18n/ja/qpe.ts
index e7d6c07..bfab94d 100644
--- a/i18n/ja/qpe.ts
+++ b/i18n/ja/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ja/security.ts b/i18n/ja/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/ja/security.ts
+++ b/i18n/ja/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/sysinfo.ts b/i18n/ja/sysinfo.ts
index d021c96..1af3e2d 100644
--- a/i18n/ja/sysinfo.ts
+++ b/i18n/ja/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/aqpkg.ts b/i18n/ko/aqpkg.ts
index 85e0a63..cb2a1e0 100644
--- a/i18n/ko/aqpkg.ts
+++ b/i18n/ko/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/ko/backup.ts b/i18n/ko/backup.ts
index 1f2ebda..75e23eb 100644
--- a/i18n/ko/backup.ts
+++ b/i18n/ko/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></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/ko/calibrate.ts b/i18n/ko/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/ko/calibrate.ts
+++ b/i18n/ko/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ko/clock.ts b/i18n/ko/clock.ts
index 6ddbc2c..401926f 100644
--- a/i18n/ko/clock.ts
+++ b/i18n/ko/clock.ts
@@ -14,196 +14,193 @@
         <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>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-</context>
 </TS>
diff --git a/i18n/ko/fifteen.ts b/i18n/ko/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/ko/fifteen.ts
+++ b/i18n/ko/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/language.ts b/i18n/ko/language.ts
index 34e0346..1562400 100644
--- a/i18n/ko/language.ts
+++ b/i18n/ko/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libaboutapplet.ts b/i18n/ko/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/ko/libaboutapplet.ts
+++ b/i18n/ko/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/ko/libcardmonapplet.ts b/i18n/ko/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/ko/libcardmonapplet.ts
+++ b/i18n/ko/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/ko/libliquid.ts b/i18n/ko/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/ko/libliquid.ts
+++ b/i18n/ko/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libmailwrapper.ts b/i18n/ko/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/ko/libmailwrapper.ts
+++ b/i18n/ko/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/ko/libopiesecurity2.ts b/i18n/ko/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/ko/libopiesecurity2.ts
+++ b/i18n/ko/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/ko/libopieui2.ts b/i18n/ko/libopieui2.ts
index a40cb08..51a5983 100644
--- a/i18n/ko/libopieui2.ts
+++ b/i18n/ko/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libwlan.ts b/i18n/ko/libwlan.ts
index d7985ab..37fdc29 100644
--- a/i18n/ko/libwlan.ts
+++ b/i18n/ko/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AWLan</name>
     <message>
-        <source>any</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>SSID</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</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/ko/minesweep.ts b/i18n/ko/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/ko/minesweep.ts
+++ b/i18n/ko/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/opiemail.ts b/i18n/ko/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/ko/opiemail.ts
+++ b/i18n/ko/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/qpe.ts b/i18n/ko/qpe.ts
index e7d6c07..bfab94d 100644
--- a/i18n/ko/qpe.ts
+++ b/i18n/ko/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ko/security.ts b/i18n/ko/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/ko/security.ts
+++ b/i18n/ko/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/sysinfo.ts b/i18n/ko/sysinfo.ts
index d021c96..1af3e2d 100644
--- a/i18n/ko/sysinfo.ts
+++ b/i18n/ko/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/lv/aqpkg.ts b/i18n/lv/aqpkg.ts
index a0c4ae0..66c00fa 100644
--- a/i18n/lv/aqpkg.ts
+++ b/i18n/lv/aqpkg.ts
@@ -17,413 +17,427 @@
         <translation>Lasa konfigurāciju...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Atlikt</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Izņemt
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalēt
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Uzlabot</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Pārinstalēt)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Uzlabot)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Mērķis</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Pieejamā Vieta</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izvads</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Starts</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visas</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Teksts</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Pārtraukt</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>**** Lietotājs klikšķināja PĀRTRAUKT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Process Pārtraukts ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Saglabāt izvadu</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Piespiedu Atkarības</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Piespiedu Pārinstalācija</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Piespiedu Izņemšana</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Piespiedu Pārrakstīšana</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informācijas Līmenis</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Tikai kļūdas</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normālas ziņas</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informatīvās ziņas</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problēmu izvads</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Darbojos ar paku %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Izņemu simboliskās saites...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Veidoju simboliskās saites priekš %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Veidoju simboliskās saites priekš %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Pabeigts</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Izņemu statusa ierakstu...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>statusa fails -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>paka -</translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Nevaru atvērt statusa failu -</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Nevaru izveidot pagaidu statusa failu -</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Nevaru iestartēt ipkg procesu</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Nevaru atvērt :</translation>
+        <translation type="obsolete">Nevaru atvērt :</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Veidoju direktoriju</translation>
+        <translation type="obsolete">Veidoju direktoriju</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Saistīts %1 ar %2</translation>
+        <translation type="obsolete">Saistīts %1 ar %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Neizdevās saite %1 uz %2</translation>
+        <translation type="obsolete">Neizdevās saite %1 uz %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Izņemts %1</translation>
+        <translation type="obsolete">Izņemts %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Neizdevās izņemt %1</translation>
+        <translation type="obsolete">Neizdevās izņemt %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Izņemts</translation>
+        <translation type="obsolete">Izņemts</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Neizdevās izņemt</translation>
+        <translation type="obsolete">Neizdevās izņemt</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Paku Menedžeris</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Šeit rakstiet tekstu meklēšanai.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klikšķiniet šeit lai paslēptu Ātrās Pārvietošanās instrumentjoslu.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Atjaunot sarakstus</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klikšķiniet šeit, lai no serveriem atjauninātu paku sarakstus.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Atjaunināt</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klikšķiniet šeit lai atjauninātu instalētās pakas ja ir pieejama jaunāka versija.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Lejuplādēt</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai lejuplādētu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uzlikt izmaiņas</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai instalētu, izņemtu vai atjauninātu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurēt</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klikšķiniet šeit lai konfigurētušo aplikāciju.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Darbības</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Rādīt pakas kuras nav instalētas</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir pieejamas bet vēl nav instalētas.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Rādīt instalētās pakas</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir instalētas.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Rādīt atjauninātās pakas</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klikšķiniet šeit lai rādītu pakas kuras ir instalētas un kurām ir pieejama jaunāka versija.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrēt pēc kategorijas</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klikšķiniet šeit lai uzrādītu pakas kuras pieder vienai kategorijai.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Uzstādīt kategorijas filtru</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klikšķiniet šeit, lai mainītu paku filtra kategoriju.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klikšķiniet šeit lai meklētu pakas pēc nosaukuma.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Meklēt nākamo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klikšķiniet šeit lai meklētu nākamo paku kuras nosaukums satur norādīto tekstu.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Ātrās Pārvietošanāš pogas</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klikšķiniet šeit lai parādītu/paslēptu taustiņus kuri ļauj ātri pārvietoties pa paku sarakstu.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Skats</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klikšķiniet šeit lai paslēptu meklēšanas instrumentu paneli.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveri:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klikšķiniet šeit lai atzīmētu paku avotu.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakas</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Šis ir uzrādītā servera visu paku saraksts.
 
 Zilais punkts pie pakas vārda norāda ka paka jau ir uzinstalēta
 
 Zilais punkts ar zvaigznīti norāda ka šai pakai dotajā serverī ir pieejams jauninājums.
 
 Klikšķiniet pa kreisi no pakas, lai to atzīmētu.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klikšķiniet šeit lai izņemtu iezīmēto paku(as).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Veidoju serveru sarakstu:
  %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Veidoju paku sarakstu priekš:
   %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Atjaunoju serveru paku sarakstu</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>UZMANĪBU: Atjaunināšana
diff --git a/i18n/lv/backup.ts b/i18n/lv/backup.ts
index 924266f..0822255 100644
--- a/i18n/lv/backup.ts
+++ b/i18n/lv/backup.ts
@@ -1,117 +1,137 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Kopēšana un Atjaunošana... strādāju...</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Sistēmas kļūda:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Ziņa</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Kopēšana Neizdevās!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaļas</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Kopēšana un Atjaunošana.. Neizdevās !!</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Kopēšana un Atjaunošana</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Lūdzu norādiet kaut ko atjaunošanai.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Atjaunošana Neizdevās.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nevaru atvērt failu: %1</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Kopēšana Pabeigta.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Atjaunošana Pabeigta.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Kopēšana un Atjaunošana</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopēšana</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Saglabāt Uz</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopēšana</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikācijas</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Atjaunot</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolonna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Atjaunot</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Izvēlaties Avotu</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Atjaunot Failusarakstu</translation>
+        <translation type="obsolete">Atjaunot Failusarakstu</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Kļūdas Info</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Kļūdas Paziņojums:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Labi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/calibrate.ts b/i18n/lv/calibrate.ts
index 07af61b..229a466 100644
--- a/i18n/lv/calibrate.ts
+++ b/i18n/lv/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>Pieskarieties viegli krustiņiem un
 akurāti kalibrējiet ekrānu.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Laipni lūgti Opie</translation>
+        <translation type="obsolete">Laipni lūgti Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/fifteen.ts b/i18n/lv/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/lv/fifteen.ts
+++ b/i18n/lv/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/language.ts b/i18n/lv/language.ts
index 687f0d8..5e478a7 100644
--- a/i18n/lv/language.ts
+++ b/i18n/lv/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Angļu</translation>
     </message>
     <message>
         <source>default</source>
         <translation>noklusētā</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>Valodas Uzstādījumi</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Izvēlaties valodu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libaboutapplet.ts b/i18n/lv/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/lv/libaboutapplet.ts
+++ b/i18n/lv/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/lv/libcardmonapplet.ts b/i18n/lv/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/lv/libcardmonapplet.ts
+++ b/i18n/lv/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/lv/libliquid.ts b/i18n/lv/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/lv/libliquid.ts
+++ b/i18n/lv/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libmailwrapper.ts b/i18n/lv/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/lv/libmailwrapper.ts
+++ b/i18n/lv/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/lv/libopiesecurity2.ts b/i18n/lv/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/lv/libopiesecurity2.ts
+++ b/i18n/lv/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/lv/libopieui2.ts b/i18n/lv/libopieui2.ts
index d37145e..2fdd732 100644
--- a/i18n/lv/libopieui2.ts
+++ b/i18n/lv/libopieui2.ts
@@ -1,175 +1,209 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="unfinished">FailuDialogs</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished">Atvērt</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Saglabāt</translation>
+    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished">Izvēlēties Katalogu</translation>
+    </message>
+</context>
+<context>
+    <name>OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Stils</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Izmērs</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="unfinished">Glāžšķūņu utt</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Laiks:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izvēlaties Laiku:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Mime Tips</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FailuDialogs</translation>
+        <translation type="obsolete">FailuDialogs</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Atvērt</translation>
+        <translation type="obsolete">Atvērt</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Saglabāt</translation>
+        <translation type="obsolete">Saglabāt</translation>
     </message>
     <message>
         <source>Select Directory</source>
-        <translation>Izvēlēties Katalogu</translation>
+        <translation type="obsolete">Izvēlēties Katalogu</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Vārds:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stils</translation>
+        <translation type="obsolete">Stils</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Izmērs</translation>
+        <translation type="obsolete">Izmērs</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Glāžšķūņu utt</translation>
+        <translation type="obsolete">Glāžšķūņu utt</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurācijas Atslēga</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Atslēga</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Noklusētā Atslēga</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Īsinājumikona Atzīmētai Darbībai</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Nekas</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>N&amp;oklusētais</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Pielāgots</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Konfigurēšanas Atslēga</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>Noklusētais:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Atslēga ir MelnajāSarakstā</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>&lt;qt&gt;Atslēga kuru jūs izvēlējāties ir melnajā sarakstā un to nevar reģistrēt ar šo menedžeri.  Lūdzu lietojiet citu atslēgu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Atslēga jau ir piesaistīta</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>&lt;qt&gt;Izvēlētā atslēga jau ir izvēlēta citai konigurācijai.  Lūdzu izmantojiet citu atslēgu.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Faili</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Visi Faili</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nekas</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation>Katalogi</translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation>Visi Katalogi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libwlan.ts b/i18n/lv/libwlan.ts
index d7985ab..37fdc29 100644
--- a/i18n/lv/libwlan.ts
+++ b/i18n/lv/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AWLan</name>
     <message>
-        <source>any</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>SSID</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</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/lv/minesweep.ts b/i18n/lv/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/lv/minesweep.ts
+++ b/i18n/lv/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/opiemail.ts b/i18n/lv/opiemail.ts
index cde16b2..39c709d 100644
--- a/i18n/lv/opiemail.ts
+++ b/i18n/lv/opiemail.ts
@@ -1,690 +1,809 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Kļūda veidojot jaunu Folderi</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Kļūda veidojot&lt;br&gt;jaunu folderi - pārtraucu.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Nav ierakstu adresu grāmatā.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Jums jānorāda vismaz viena adrese.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Adreses Izvēle</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Vārds</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Problēma</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu vispirms izveidojiet SMTP kontu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu izvēlaties failu.&lt;/p&gt;</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">Jā</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nē</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>Veidot Vēstuli</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>nosūtīt vēlāk</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>lietot:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Temats</translation>
     </message>
     <message>
         <source>From</source>
         <translation>No</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Kam</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcijas</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Atbildēt</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Paraksts</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Pielikums</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Dzēst Failu</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Pievienot Failu</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Jautājums</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vai tiešām vēlaties dzēst iezīmēto Pieslēgumu?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nē</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu izvēlaties pieslēgumu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Konfigurēt Pieslēgumus</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Dzēst</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma Vārds</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Ziņas</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Konfigurēt IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Lietot SSL</translation>
+        <translation type="obsolete">Lietot SSL</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma Vārds</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Prefikss</translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Lietot secure sockets:</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Veidot jaunu vēstuli</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Sūtīt pastu no rindas</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Slēpt/Rādīt mapes</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Labot uzstādījumus</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Konfigurēt pieslēgumus</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Pastkaste</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Temats</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Sūtītājs</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</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>Konfigurēt NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma vārds</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Lietot SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Pielietot lietotājvārdu</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>Ievadiet direktorija vārdu</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Direktorija vārds:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Direktorija satur citus apakšdirektorijus</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Pasta rinda iztukšota</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Vai tiešām vēlaties dzēst šo pastu? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Lasīt šo pastu</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Dzēst šo pastu</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopēt/Pārvietot šo pastu</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Kļūda veidojot jaunu Mapi</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Kļūda veidojot &lt;br&gt;jaunu mapi - pārtraucu.&lt;/center&gt;</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>Konfigurēt POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma Nosaukums</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Lietot secure sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation></translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Konfigurēt SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Lietot SSL</translation>
+        <translation type="obsolete">Lietot SSL</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Lietot Pieslēgšanos</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma vārds</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>SMTP server nosaukums</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>SMTP servera ports</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Lietot secure sockets:</translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Izvēlēties Tipu</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Izvēlēties Pieslēguma Tipu</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Uzstādījumu Dialogs</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Skatīt Pastu</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Skatīt pastu kā Html</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Veidot Pastu</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Sūtīt pastu vēlāk (ievietot izejošajos)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Uzdevumu Aplets</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Atslēgt Uzdevumu Apletu</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Uzstādīt cik bieži</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Mirgot kad pienāk jauns pasts</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Atskaņot Melodiju kad pienāk jauns pasts</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation>Forma1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TekstaLabelis1</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Rādīt Tekstu</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Saglabāt Pievienojumu</translation>
     </message>
     <message>
         <source>From</source>
         <translation>No</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Kam</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Vēstules saturs nav vēl atlādēts, tamdēļ nav iespējams sagatavot atbildi.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Vēstules saturs nav vēl atlādēts, tamdēļ nav iespējams pārsūtīt vēstuli.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Vai tiešām vēlaties dzēst šo pastu? &lt;br&gt;&lt;br&gt;</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>E-Pasts no %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Atbildēt</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Pārsūtīt</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Pievienojumi</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Rādīt Html</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Dzēst Pastu</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Faila nosaukums</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</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>Iezīmējat mērķa kasti</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Saglabāt pastu uz&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Mape:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Pieslēgums:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Veidot jaunu folderi</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Prefiks tiks pievienots, nav nepieciešams to ievadīt!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Pārvietot pastu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/qpe.ts b/i18n/lv/qpe.ts
index e709694..07a75ac 100644
--- a/i18n/lv/qpe.ts
+++ b/i18n/lv/qpe.ts
@@ -1,414 +1,410 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Valoda</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DokumentuTabs</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Datums un Laiks</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Personas Informācija</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Aplikācijas Problēma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 neatbild.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vai vēlaties apstādināt aplikāciju piespiedu kārtā?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Šai aplikācijai ir liegta ātrā ielāde.  Nospiediet un pieturiet aplikācijas ikonu, lai to atļautu.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; tika pārtraukts ar signāla kodu %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikācija pārtraukta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikācija nav atrasta</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nevaru atrast aplikāciju &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nevaru atrast aplikāciju %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Atzīmējiet krustiņu un
 akurāti kalibrējiet ekrānu.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Laipni lūgti Opie</translation>
+        <translation type="obsolete">Laipni lūgti Opie</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Bateriju Statuss</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Tukšas Baterijas</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Atpakaļ</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Nākamais &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Nospiediet uz ekrāna lai sāktu.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Lūdzu uzgaidiet, ielādēju %1 uzstādījumus.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Lūdzu uzgaidiet...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Pabeigt</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unikods</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Palaidējs</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Palaidējs</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nav aplikācijas</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Šim dokumentam nav definētas aplikācijas.&lt;p&gt;Tips ir %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Skatīt kā tekstu</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Meklēju Dokumentus...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Dokumentu Tab&lt;p&gt;ir aizliegts.&lt;p&gt;Lai to atjaunotu izmantojiet Uzstādījumi-&gt;Palaidējs&gt;DokumentuTabs&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikonu Skats</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Saraksta Skats</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Visi tipi</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentu Skats</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Atrasts jauns krātuves veids:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Ko lai ar to dara?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Kurus mediju failus</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Visus</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Attēlu</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekstu</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Ierobežot meklēšanu:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Skanēt visu nesēju</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Vienmēr pārbaudīt šo nesēju</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Drošais Režīms</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Spraudņu Menedžeris...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Pārlaist Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Palīdzība...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informācija</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sistēmas datums šķiet nav pareizs.
 (%1)&lt;/p&gt;&lt;p&gt;Vai vēlaties mainīt pulksteņa uzstādījumus ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>UZMANĪBU</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Bateriju līmenis ir kritisks!&lt;p&gt;Izslēdziet līdz uzlādei</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Baterija paliek tukša.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation>&lt;p&gt;Rezerves baterija ir tukša&lt;p&gt;Lūdzu uzlādējiet papildus bateriju</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>vizītkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Drošais Režīms</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Labi</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spraudņu Menedžeris...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/security.ts b/i18n/lv/security.ts
index d607219..40eb169 100644
--- a/i18n/lv/security.ts
+++ b/i18n/lv/security.ts
@@ -62,201 +62,197 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
         <source>Authentication</source>
         <translation>Autentifikācija</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinh</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Uzmanību</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation>&lt;p&gt;Visi lieotāju-definēti diapazoni pazudīs.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Labi</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Visi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Neviens</translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation>Kad noslēgt Opie</translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation>pie Opie startēšanas</translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation>pie Opie atjaunošanas</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Vairāku spraudņu autentifikācija</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Nepieciešamās izdošanās</translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation>Atblusošanas opcijas</translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Neaizsargāt šo konfigurācijas ekrānu</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Rādīt skaidrojošās formas</translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation>Atļaut izlaist autentifikāciju</translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation>Piezīme: trešā opcija ietekmē otro</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptēt sync no tīkla:</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation>Izvēlaties tīkla diapazonu vai ievadiet jaunu.  
 
 Šis kombo lists ļauj jums izvēlēties diapazonu kuram tiks atļauta pieslēgšanās  
 
 Piemēram, diapazons 192.168.1.0/24 atļaus sinhronizēties datoriem ar IP starp 192.168.1.1. un 192.168.1.254  
 
 Ieraksts &quot;Visi&quot; ļaus pieslēgties *jebkuram*.
 Ieraksts &quot;Neviens&quot; *aizliegs* pieslēgumu visiem.  
 
 Ja nēsiet pārliecināti, izvēlaties &quot;Visi&quot;. </translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Dzēst Ierakstu</translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation>Dzēst izvēlēto diapazonu no saraksta
 
 Ja jūs nospiedīsiet šo pogu, iezīmētais diapazons tiks dzēsts no saraksta.
 
 Ja jus nospiedāt šo pogu kļūdas pēc, jūs variet atjaunot noklusētos
 uzstādījumus ar pogu &quot;Atjaunot Noklusētos&quot;.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Ataunot Noklusētos</translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation>Šī poga atjaunos diapazonus
 uz noklusētajiem
 
 Uzmanību! Visi ar roku ievadītie diapazoni tiks dzēsti!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Izvēlaties sinhronizēšanas programatūru</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>Norādiet Sync Protokolu lai apmierinātu atšķirīgas iekārtas
-                      IntelliSync izslēgs paroles pārbaudi bet jums būs jāakceptē pieslēgums.
-                     Opie1.0 ir savietojams ar QtopiaDesktop, MultiSync un KitchenSync
-                     Qtopia1.7 mainīs kā dati tiek sūtīti klientam un tas nestrādās vecākiem klientiem.
-</translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/sysinfo.ts b/i18n/lv/sysinfo.ts
index f32de31..fcb70e8 100644
--- a/i18n/lv/sysinfo.ts
+++ b/i18n/lv/sysinfo.ts
@@ -1,259 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Šī sadaļa rāda pieejamos testus, veiktajiem testiem tiek parādīts arī rezultāts, un salīdzinājums ar kādu izvēlētu iekārtu.  Lietojiet izvēles rūtiņas lai definētu kurus testus jūs vēlaties izpildīt.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Testi</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Rezultāti</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Salīdzinājums</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Veselo Skaitļu Aritmētika</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Peldošā Komata Vienība</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Teksta Renderēšana</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Gfx Renderēšana</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Veiktspēja</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kartes Veiktspēja</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>4. CF Kartes Veiktspēja</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Sākt Testus!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klikšķiniet šeit, lai palaistu izvēlētos testus.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Izvēlaties modeli ar kuru salīdzināt rezultātus.</translation>
     </message>
     <message>
         <source>Compare To:</source>
-        <translation>Salīdzināt Ar:</translation>
+        <translation type="obsolete">Salīdzināt Ar:</translation>
     </message>
     <message>
         <source>error</source>
         <translation>kļūda</translation>
     </message>
+    <message>
+        <source>Compare:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Šis grafs rāda cik daudz atmiņas ir izlietots šajā Compact Flash atmiņas kartē.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>C</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz cietā diska.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Šis grafs rāda cik daudz vietas ir aizņemts uz Secure Digital atmiņas kartes.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Ie</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Šis grafs rāda cik daudz atmiņas ir aizņemts uz šī handheld iebūvētās atmiņas (piem. Flash atmiņa).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Šis grafs norāda cik daudz atmiņas tiek patreiz lietots pagaidu RAM diskā.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Aplikācijas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Sistēmas CPU lietojums (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Šī lapa rāda cik daudz tiek izmantots iekārtas procesors.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tips:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Šī lapa rāda atmiņas (piem. RAM) izlietojumu šajā iekārtā.
 Atmiņas ir kategorizētas sekojoši:
 
 1. Izmantots - atmiņu izmanto Opie un jebkura strādājoša aplikācija.
 2. Buferi - pagaidu datu glabātuve kas tiek lietota lai uzlabotu veiktspēju.
 3. Kešots - informācija, kas nesen lietota un nav vēl atbrīvota.
 4. Brīvs - atmiņa kuru patreiz neizmanto Opie vai aplikācijas.</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Kopā Atmiņa: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buferi (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Kešs (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Brīvs (%1 kB)</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Kopā Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulis</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Lieto#</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Izmanto</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Šis ir saraksts ar visiem šajā handheld iekārtā ielādētajiem kerneļa moduļiem.
 
 Klikšķiniet un pieturiet uz moduļa, lai redzētu papildus informāciju par moduli, vai arī to izlādētu.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Izvēlaties šeit komandu un klikšķiniet Nosūtīt pogu pa labi, lai aizsūtītu zemāk izvēlētam modulim komandu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Sūtīt</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klikšķiniet šeit, lai aizsūtītu iezīmēto komandu zemāk norādītam modulim.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Šis lauks rāda papildus informāciju par šo moduli.</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>
 Vai tiešām vēlaties palaist
 %1 šim modulim?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Izmantots (1% kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Pieejams (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Komanda</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Statuss</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Laiks</translation>
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
@@ -14,413 +14,395 @@
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Вчитување на конфигурацијата...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Прифати</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Откажи</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Инсталирај</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Повторно инсталирај)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Надгради)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Цел</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Слободен простор</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Аите</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Откажи</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Откажано од Корисник ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Прекинат Процес ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Сними излез</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Форсирај Зависности</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Форсирај повторна инсталација</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Форсирај отстранување</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Офрисрај Препишување</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Ниво на информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Само грешки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Нормални пораки</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Информативни пораки</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Детален излез</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Надгради</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Превземи</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Кликни овде за да се превземат избраните пакети.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Примени промени</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Акции</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Прикажи ги неинсталираните пакети</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Прикажи инсталирани пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Прикажи ги надградените пакети</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Филтрирај по категорија</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Постави категорија за филтрирање</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Кликни овде за се промени категоријата за користениот филтер.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Најди текст</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Палета за брзо скокање</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Сервери:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Кликни овде за да се избере извор на пакети.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Пакети</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ова е листа на сите пакети од избраниот извор
 
 Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
 
 Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
 
 Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Кликни тука за да се отрстранта избраните пакети.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Листана сервери:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Листа на пакети за:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Освежување на листи на пакети</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
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
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Бекап и Обновување...работи...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Бекап</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Апликации</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Сними во</translation>
     </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
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Осфрли SD/MMC картичка</translation>
     </message>
     <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
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -1,342 +1,312 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Коче календар</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">копче контакти</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">копје мени</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">ротирање на екран</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Плава:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
-    <name>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>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -402,384 +372,414 @@ and </source>
         <translation type="obsolete">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Одбери Време:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Диалог на датотеки</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Отвори</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Сними</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Стил</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Големина</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Службен Пејџер:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Сите електронски писма:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Менаџер:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Сопруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Деца:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Ова е настан за цел ден</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Ова е настан од повеќе денови</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Старт:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Крај:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Забелешка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
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
@@ -1,611 +1,641 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Коче календар</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">копче контакти</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">копје мени</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">ротирање на екран</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Плава:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
-    <name>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>
     <message>
         <source>Week</source>
         <translation type="obsolete">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Одбери Време:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Тип</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="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>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Канцеларија:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Службен Пејџер:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Сите електронски писма:</translation>
     </message>
     <message>
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
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -1,372 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="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>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Нивото на батеријата е многу ниско.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">Визиткарта</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Состојба на батерија</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Документи</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Преглед по листа</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Поврзи апликации</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Додај</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Аудио</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Сите</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">Видео</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Додај</translation>
     </message>
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
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Овој граф покажува колку меморија се користи на оваа SD картичка.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Оваа страна покажува како меморијата се алоцира на овој уред,
 Меморијата се каратеризира според:
 
 1. Искористена - меморија која ја искоритуваат апликациите
 2. Бафери - привремени локации кои се користат за подобрување на перформансите
 3. Кеширани - информации кои биле скоро користени
 4. Слободна - меморија која не се користи.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Бафери ( %1 кВ)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кеширана (%1) кВ</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Слободна (%1 кВ)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Вкупно меморија: %1 кВ</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модул</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Искоритено#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Искористено од</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ова е листа на сите вчитани модули на кернелот.
 
 Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Овој дел прикажува детални информации за модулот.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Да се изврши</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кВ</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Словофни (%1 кВ)</translation>
diff --git a/i18n/nl/aqpkg.ts b/i18n/nl/aqpkg.ts
index 7838210..87621d3 100644
--- a/i18n/nl/aqpkg.ts
+++ b/i18n/nl/aqpkg.ts
@@ -18,413 +18,427 @@
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleer</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Verwijder
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installeer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Vernieuw
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Herinstallatie)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Vernieuw)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Doel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Beschikbare ruimte</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Gebruiker drukte op AFBREKEN ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Bewerking Afgebroken ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Sla utivoer op</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 kB</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forceer Afhankelijkheden</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forceer Herinstallatie</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forceer Verwijderen</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forceer Overschrijven</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informatieniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Alleen Fouten</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale berichten</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informatieve berichten</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Foutopsporingsuitvoer</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Verwerken van pakket %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Verwijderen van symbolysche links...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Maak symbolische links aan voor %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Maak symbolische links aan voor %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Verwijder status info...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>statusbestand - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pakket - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Kan statusbestand niet openen - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Kan tijdelijk statusbestand niet maken - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Kan ipkg proces niet starten</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Kan niet openen:</translation>
+        <translation type="obsolete">Kan niet openen:</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Maak map aan</translation>
+        <translation type="obsolete">Maak map aan</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Link gemaakt van %1 naar %2</translation>
+        <translation type="obsolete">Link gemaakt van %1 naar %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Link van %1 naar %2 mislukt</translation>
+        <translation type="obsolete">Link van %1 naar %2 mislukt</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Verwijderd %1</translation>
+        <translation type="obsolete">Verwijderd %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>%1 verwijderen mislukt</translation>
+        <translation type="obsolete">%1 verwijderen mislukt</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Verwijderd</translation>
+        <translation type="obsolete">Verwijderd</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Verwijderen mislukt</translation>
+        <translation type="obsolete">Verwijderen mislukt</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Typ hier de te zoeken tekst.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik hier on de Quick Jump werkbalk te verbergen.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Vernieuw lijsten</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik hier om alle geinstaleerde pakketten te vernieuwen als er een nieuwere versie is.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik hier on de momenteel geselecteerde pakketten op te halen.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Voer uit</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde pakketten te installeren, verwijderen of vernieuwen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akties</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Laat niet geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik hier om beschikbare pakketten te laten zien die niet geinstallerd zijn.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Laat geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik hier om de momenteel geinstalleerde paketten te zien.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Laat vernieuwde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik hier om geinstalleerde pakketten te laten zien waar een nieuwere versie van beschikbaar is.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter op kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik hier om paketten te laten zien die tot een kategorie behoren.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Stel kategoriefilter in</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik hier om pakket-filtercategorie te wijzigen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik hier om te zoeken op tekst in pakketnamen.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik hier om het volgende pakket te zoeken die aan de zoektekst voldoet.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump toetsenblok</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik hier om het toetsenblok te laten zien/verbergen om snelle toegang tot de pakketlijst mogelijk te maken. </translation>
     </message>
     <message>
         <source>View</source>
         <translation>Aanzicht</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik hier om de zoekbalk te verbergen.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servers:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik hietr om een pakketbron te kiezen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakketten</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dit is een lijst met alle paketten van de bovenstaande server.
 
 Een blauw bolletje naast de naam geeft aan dat het pakket momenteel is geinstalleerd.
 
 Een blauw bolletje met een ster geeft aan dat er een nieuwere versie van dit pakket beschikbaar is.
 
 Vink het vakje aan de linkerkant aan om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde paketten te verwijderen.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op voor:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Ververs serverpakketlijsten</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>WAARSCHUWING: Upgraden
diff --git a/i18n/nl/backup.ts b/i18n/nl/backup.ts
index 8898e86..2728277 100644
--- a/i18n/nl/backup.ts
+++ b/i18n/nl/backup.ts
@@ -1,125 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Backup en herstel, voortgang....</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup en herstel</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Fout van systeem:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Bericht</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Backup mislukt!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup en Herstel is mislukt!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Backup succesvol.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Selecteer iets om te herstellen.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Herstel mislukt.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Kan bestand %1 niet openen</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Herstel sucsesvol.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Backup gelukt.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Herstel gelukt.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Backup en herstel</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Opslaan in</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Herstel</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Selecteer bron</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolom 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>He&amp;rstel</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Bestandenlijst vernieuwen</translation>
+        <translation type="obsolete">Bestandenlijst vernieuwen</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Foutinformatie</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Foutomschrijving:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/calibrate.ts b/i18n/nl/calibrate.ts
index 2304a8a..a2430bd 100644
--- a/i18n/nl/calibrate.ts
+++ b/i18n/nl/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>Raak de richtkruisen duidelijk en
 precies aan om uw scherm te calibreren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Welkom bij Opie</translation>
+        <translation type="obsolete">Welkom bij Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/fifteen.ts b/i18n/nl/fifteen.ts
index b7a29d1..ad31471 100644
--- a/i18n/nl/fifteen.ts
+++ b/i18n/nl/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>Hussel</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Los op</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Schuifpuzzel</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Schuifpuzzel</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gefeliciteerd!
 Je hebt gewonnen!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Hussel stukjes</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>Herstel stukjes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/kpacman.ts b/i18n/nl/kpacman.ts
index 75d3f99..2f8d980 100644
--- a/i18n/nl/kpacman.ts
+++ b/i18n/nl/kpacman.ts
@@ -42,217 +42,217 @@
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Verberg Muiscursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selecteer grafiche elementen</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pauzeer in de achtergrond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Ga door op de voorgrond</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Verander &amp;toetsen...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoenissen (joe@dsite.de)
 
 Een pacman spel voor de KDE Desktop
 Dit programma is gebaseerd op de bron van ksnake
 door Michel Filippi (mfilippi@sade.rhein-main.de).
 Het design is sterk beinvloed door Pacman (c)
 1980 MIDWAY MFG.CO.
 
 Ik wil hierbij mijn vriendin Elke Krueers bedanken
 voor de laatste 10 jaar van haar vriendschap.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation type="obsolete">Canfiguratiefout</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation type="obsolete">Er zijn geen schema&apos;s gedefinieerd,
 of er is geen schema geselecteerd.</translation>
     </message>
     <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Het bitfont kan niet worden geconstrueerd
 
 Het bestand &apos;@FONTNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>GAME OVER</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>SPELER EEN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>KLAAR!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUZE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>KARAKTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>BIJNAAM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SCHADUW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-MEPPER</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-PRIKKER</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA AANPASSING: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>DRUK OP CURSOR OM TE STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    GEFELICITEERD</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   U EEN TOP 10 SCORE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>BEHAALD.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   SCORE  NAAM  DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSED</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>De pixelmap kan niet worden gemaakt.
 
 Het bestand &apos;@PIXMAPNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initialisatiefout</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/language.ts b/i18n/nl/language.ts
index 48a9e28..be39a5b 100644
--- a/i18n/nl/language.ts
+++ b/i18n/nl/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Engels</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Standaard</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>Taalinstellingen</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Selecteer taal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libaboutapplet.ts b/i18n/nl/libaboutapplet.ts
index 814f3fa..1e62628 100644
--- a/i18n/nl/libaboutapplet.ts
+++ b/i18n/nl/libaboutapplet.ts
@@ -1,122 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Over.. snelkoppeling</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Over...</translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation>Over...</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="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</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="obsolete">&lt;p&gt;
 De &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is geschreven en wordt onderhouden door het Opie Team, een wereldwijd netwerk van softwarebouwers die zich toeleggen op vrije/gratis softwareontwikkeling.
 &lt;/p&gt;
 &lt;p&gt;
 Er is geen centrale groep, bedrijf of instelling die de Opie broncode bezit. Iedereen is welkom om bij te dragen aan Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; voor meer informatie over het Opie project.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Schrijvers</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>&lt;p&gt;
+        <translation type="obsolete">&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;</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Rapporteer</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>
         <translation type="obsolete">&lt;p&gt;Software kan altijd worden verbeterd, en het Opie Team is er klaar voor. Maar jij - de gebruiker - kunt ons vertellen als iets niet werkt zoals verwacht, of beter gedaan kan worden.&lt;/p&gt;
 &lt;p&gt;De Open Palmtop Integrated Environment heeft een foutmanagement systeem. Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; om fouten te melden (in het engels).&lt;/p&gt;
 &lt;p&gt;Als je een verbetering of suggestie hebt willen wij vragen om het foutmanagementsysteem te gebruiken om dit door te geven. Zorg er dan wel voor dat de melding de prioriteit &quot;Feature Wish&quot; geeft.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Meedoen</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>
         <translation type="obsolete">&lt;p&gt;Je hoeft geen softwareontwikkelaar te zijn om lid van het Opie Team te zijn. Je kunt meedoen met de nationale teams die programma-interfaces vertalen, je kunt plaatjes thema&apos;s, geluiden of verbeterde documentatie maken, en nog veel meer. Beslis zelf!&lt;/p&gt;
 &lt;p&gt;Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; voor informatie over een aantal van de projecten waaraan je mee kunt helpen.&lt;/p&gt;
 &lt;p&gt;Als je meer informatie of documentatie nodig hebt, kan een bezoek aan &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; je voorzien in alles wat je nodig hebt.&lt;/p&gt;</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">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</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">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</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/nl/libcardmonapplet.ts b/i18n/nl/libcardmonapplet.ts
index b1a77fb..3310ef4 100644
--- a/i18n/nl/libcardmonapplet.ts
+++ b/i18n/nl/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Sluit SD/MMC kaart af</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Afsluiten kaart 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Afsluiten kaart 1: %1</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Afsluiten CF/PCMCIA kaart mislukt!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Afsluiten SD/MMC kaart mislukt!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nieuwe kaart:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Afgesloten:</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/nl/libmailwrapper.ts b/i18n/nl/libmailwrapper.ts
index 01ee9fb..bca5b10 100644
--- a/i18n/nl/libmailwrapper.ts
+++ b/i18n/nl/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation>fout bij verbinden imap server: %1</translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation>fout bij aanmelden imap server: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation>Mailbox is leeg</translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation>Mailbox bevat %1 mails</translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation>Fout bij ophalen berichtkoppen: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation>Mailbox is leeg!</translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation>fout bij verwijderen mail: %1</translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation>Kan map %1 nieu gebruikern voor opslag submappen</translation>
     </message>
     <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation>fout bij kopieren mails: %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>fout bij kopieren mail: %1</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>Aanmelden</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>Mailbox bevat %1 mail(s)</translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation>Mailbox bestaat.</translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation>Fout bij instellen map</translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation>Fout bij schrijven naar berichtmap</translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation>Fout bij instellen mbox</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Fout bij ophalen mail: %1</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fout bij verwijderen mail: %1</translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation>Mailbox bestaat niet.</translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation>Fout bij verwijderen mailbox.</translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>Mailbox bevat %1 mail(s)</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Fout bij ophalen mail %1</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fout bij verwijderen mail %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Fout bij ophalen status</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>Mailbox bevat %1 mail(s)</translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation>Fout bij instellen van map</translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation>fout bij verwijderen mail</translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation>Fout bij ophalen mapinfo</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Fout bij verwijderen mail %1</translation>
     </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation>Geen fouten</translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation>Onverwachte foutcode</translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation>Service niet beschikbaar</translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation>Stream fout</translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation>gethostname() mislukt</translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation>Niet in gebruik</translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation>Fout, actie niet uitgevoerd</translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation>Data is meer dan buffer aankan</translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation>Fout in verwerking</translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation>Mailbox niet beschikbaar</translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation>Mailboxnaam niet toegestaan</translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation>Slechte commandovolgorde</translation>
     </message>
     <message>
         <source>User not local</source>
         <translation>Gebruiker niet lokaal</translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation>Transactie mislukt</translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation>Geheugenfout</translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation>Verbinding geweigerd</translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation>Onbekende foutcode</translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation>Fout bij verzenden mail</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Fout bij verzenden mailwachtrij - agebroken</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>%1 van %2 bytes verzonden</translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation>Verzend mail %1 van %2</translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation>Verzend mail</translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation>Mailvoortgang</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopiepim2.ts b/i18n/nl/libopiepim2.ts
index fc2ffcf..5e5b99d 100644
--- a/i18n/nl/libopiepim2.ts
+++ b/i18n/nl/libopiepim2.ts
@@ -1,374 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalenderknop</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Contaktenknop</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menuknop</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknop</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Thuisknop</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Opnameknop</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Beeldschermrotatie</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Lager en omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Lager en omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Lager en naar rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Lager en naar links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hoger en omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hoger en omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hoger en naar rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hoger en naar links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Kleur:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Verz:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Waarde:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rood:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Groen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blauw:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha kanaal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecteer kleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Meer</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Meer...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Bestandsdialoog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Open</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Sla op</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Naam:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groot</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Middel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stijl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation>op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -438,384 +408,414 @@ and </source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">week</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Kies tijd:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Bestandsdialoog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Sla op</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stijl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Grootte</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenten</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Bestanden</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Alle bestanden</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standaard email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Bedrijf:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Bedrijfswebpagina:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Bedrijfs telefoon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Bedrijfs fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Bedrijfs mobiel:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Bedrijfs pieper:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Prive webpagina:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Prive telefoon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Prive Fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Prive mobiel:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Wederhelft:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinderen:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Plaats:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Deze gebeurtenis duurt de hele dag</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Deze gebeurtenis duurt meerdere dagen</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Eind:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
diff --git a/i18n/nl/libopiesecurity2.ts b/i18n/nl/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/nl/libopiesecurity2.ts
+++ b/i18n/nl/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/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
index f08a207..5dfd35c 100644
--- a/i18n/nl/libopieui2.ts
+++ b/i18n/nl/libopieui2.ts
@@ -1,706 +1,736 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalenderknop</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Contaktenknop</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menuknop</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknop</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Thuisknop</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Opnameknop</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Beeldschermrotatie</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Lager en omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Lager en omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Lager en naar rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Lager en naar links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hoger en omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hoger en omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hoger en naar rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hoger en naar links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Kleur:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Verz:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Waarde:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rood:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Groen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blauw:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha kanaal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecteer kleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Meer</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Meer...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Bestandsdialoog</translation>
+        <translation type="unfinished">Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Open</translation>
+        <translation type="unfinished">Open</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Sla op</translation>
+        <translation type="unfinished">Sla op</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Naam:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groot</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Middel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stijl</translation>
+        <translation type="unfinished">Stijl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Grootte</translation>
+        <translation type="unfinished">Grootte</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Stel sleutel in</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Sleutel</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Standaardsleutel</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Sneltoets voor geselecteerde actie</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">Gee&amp;n</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">Stan&amp;daard</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Aangepast</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Stel sleutel in</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">Standaard:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">Sleutel staat op de zwarte lijst</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="obsolete">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Sleutel is al toegekend</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="obsolete">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">week</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Kies tijd:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Type</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Bestandsdialoog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Sla op</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stijl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Grootte</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished">Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Sleutel</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Standaardsleutel</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Sneltoets voor geselecteerde actie</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">Gee&amp;n</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">Stan&amp;daard</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Aangepast</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Standaard:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">Sleutel staat op de zwarte lijst</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">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Sleutel is al toegekend</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">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Standaard email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Bedrijf:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Bedrijfswebpagina:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Bedrijfs telefoon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Bedrijfs fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Bedrijfs mobiel:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Bedrijfs pieper:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Prive webpagina:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Prive telefoon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Prive Fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Prive mobiel:</translation>
     </message>
     <message>
diff --git a/i18n/nl/libwlan.ts b/i18n/nl/libwlan.ts
index 856879f..a8d8f9a 100644
--- a/i18n/nl/libwlan.ts
+++ b/i18n/nl/libwlan.ts
@@ -1,152 +1,297 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>WiFi Configuratie</translation>
+        <translation type="obsolete">WiFi Configuratie</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Algemeen</translation>
+        <translation type="obsolete">Algemeen</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Mode</translation>
+        <translation type="obsolete">Mode</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESS-ID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Kies &amp;Access Point</translation>
+        <translation type="obsolete">Kies &amp;Access Point</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Specificeer &amp;kanaal</translation>
+        <translation type="obsolete">Specificeer &amp;kanaal</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>ieder</translation>
+        <translation type="obsolete">ieder</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastructuur</translation>
+        <translation type="obsolete">Infrastructuur</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Managed</translation>
+        <translation type="obsolete">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Versleuteling</translation>
+        <translation type="obsolete">Versleuteling</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>V&amp;ersleuteling inschakelen</translation>
+        <translation type="obsolete">V&amp;ersleuteling inschakelen</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Sleutelinstelling</translation>
+        <translation type="obsolete">&amp;Sleutelinstelling</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Sleutel &amp;1</translation>
+        <translation type="obsolete">Sleutel &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Sleutel &amp;2</translation>
+        <translation type="obsolete">Sleutel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Sleutel &amp;3</translation>
+        <translation type="obsolete">Sleutel &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Sleutel &amp;4</translation>
+        <translation type="obsolete">Sleutel &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Niet-versleutelde pakketten</translation>
+        <translation type="obsolete">Niet-versleutelde pakketten</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Accepteer</translation>
+        <translation type="obsolete">&amp;Accepteer</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>Annulee&amp;r</translation>
+        <translation type="obsolete">Annulee&amp;r</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Herzoek omgeving</translation>
+        <translation type="obsolete">Herzoek omgeving</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Kan</translation>
+        <translation type="obsolete">Kan</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Algemeen</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESS-ID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Versleuteling</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">V&amp;ersleuteling inschakelen</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">&amp;Sleutelinstelling</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Sleutel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Sleutel &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Sleutel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Sleutel &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Snelheid</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Kanaal</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Station</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Ruis</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Kwalitiet</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Signaal</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Verbindingsinformatie</translation>
+        <translation type="obsolete">Verbindingsinformatie</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Kanaal</translation>
+        <translation type="obsolete">Kanaal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Mode</translation>
+        <translation type="obsolete">Mode</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Station</translation>
+        <translation type="obsolete">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Snelheid</translation>
+        <translation type="obsolete">Snelheid</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Kwalitiet</translation>
+        <translation type="obsolete">Kwalitiet</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Ruis</translation>
+        <translation type="obsolete">Ruis</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signaal</translation>
+        <translation type="obsolete">Signaal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/minesweep.ts b/i18n/nl/minesweep.ts
index 9d93f90..ca88803 100644
--- a/i18n/nl/minesweep.ts
+++ b/i18n/nl/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Gewonnen!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Je bent ontploft!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Mijnenveger</translation>
+        <translation type="obsolete">Mijnenveger</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Beginner</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Gevorderden</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/opiemail.ts b/i18n/nl/opiemail.ts
index 4869181..6a40553 100644
--- a/i18n/nl/opiemail.ts
+++ b/i18n/nl/opiemail.ts
@@ -1,690 +1,809 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fout bij maken van map</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Fout bij maken van&lt;br&gt;map - afgebroken.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>Het adresboek is leeg.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Minimaal een adres selecteren&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Adreszoeker</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Eerst een SMTP account aanmaken.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Bestand kiezen aub.&lt;/p&gt;</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">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nee</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>Nieuw bericht</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>stuur later</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>gebruik:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Van</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Antwoord aan</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Handtekening</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Bijlage</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Verwijder bestand</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Voeg bestand toe</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Vraag</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Moet het geselecteerde account echt verwijderd worden?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Selecteer een account.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Stel accounts in</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Nieuws</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Stel IMAP in</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Gebruik SSL</translation>
+        <translation type="obsolete">Gebruik SSL</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Voorvoegsel</translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Gebruik veilige sockets:</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Nieuwe mail</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Verzend mail wachtrij</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Toon/Verberg mappen</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Wijzig instellingen</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Stel accounts in</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Mailbox</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Afzender</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</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>Stel NNTP in</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Gebruik SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Gebruik Login</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>Voer mapnaam in</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Mapnaam:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Map bevat submappen</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Mail wachtrij gewist</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Moet deze mail echt worden verwijderd? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Lees deze mail</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Verwijder deze mail</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Kopieer/Verplaats deze mail</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fout bij nieuwe map aanmaken</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Fout bij maken van&lt;br&gt;nieuwe map - afgebroken.&lt;/center&gt;</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>Stel POP3 in</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Gebruik veilige sockets:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Stel SMTP in</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Gebruik SSL</translation>
+        <translation type="obsolete">Gebruik SSL</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Gebruik Login</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>SMTP Servernaam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>SMTP Servernaam</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished">Gebruik veilige sockets:</translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Kies type</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Kies Accounttype</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Instellings Dialoog</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Bekijk Mail</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Bekijk Mail als HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Nieuwe mail</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Verzend later (verzamelen in Uitmap)</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Taakbalk applet</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Blokkeer taakbalk applet</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Hoe vaak controleren</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Waarschuwings LED bij nieuwe mail</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Laat geluid horen bij nieuwe mail</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation>Formulier1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TekstLabel1</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Laat tekst zien</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Bijlage opslaan</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Van</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;De mailtekst is nog niet opgehaald, dus u kunt nog niet antwoorden.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;De mailtekst is nog niet opgehaald, dus u kunt nog niet doorsturen.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Moet deze mail echt worden verwijderd? &lt;br&gt;&lt;br&gt;</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>E-mail met %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Antwoord</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Doorsturen</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Bijlagen</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Laat HTML zien</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Verwijder Mail</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Bestandsnaam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</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>Selecteer doelmap</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Mail(s) opslaan naar&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Map:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Account:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Nieuwe map aanmaken</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Voorvoegsel wordt toegevoegd, invoeren niet nodig!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Verplaats mail(s)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 938e738..19fb93f 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -1,371 +1,371 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Tijd en Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persoonlijke Informatie</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>DocTab</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Snelladen is uitgeschakeld vorr dit programma. Druk lang op programma-icoon om weer in te schakelen&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was gestopt door signaal code %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Programma gestopt</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Programma niet gevonden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kon programma &lt;b&gt;%1&lt;/b&gt; niet vinden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kon programma %1 niet vinden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 reageert niet.&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;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Raak de richtkruizen duidelijk en
 precies aan om het scherm in te stellen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Welkom bij Opie</translation>
+        <translation type="obsolete">Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenten</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Lijstaanzicht</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batterijlading is kritiek!
 Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Batterijlading is erg laag.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">De reservebatterijlading is erg laag.
 Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">visitekaartje</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Informatie</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batterijstatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Batterij bija leeg</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Terug</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Volgende &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Tik ergens op het scherm om door te gaan.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Wachten aub, inladen van %1 instellingen.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Wachten aub...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>FirstUseBackground</translation>
+        <translation type="obsolete">FirstUseBackground</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Beeindig</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Vinden documenten</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Zoeken documenten</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Geen programma</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Bekijk als tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation>Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Lijstaanzicht</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Bestanden opzoeken...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Het Documenten Tabblad&lt;p&gt;is uitgeschakeld.&lt;p&gt;Gebruik Instellingen-&gt;Launcher-&gt;DocTab&lt;p&gt;om het weer aan te schakelen.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 bestanden</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle types van bestand</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle types</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Nieuw opslagmedium ontdekt:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Wat moet ik er mee doen?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Ingeschakeld medium</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Koppel programma&apos;s</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Beperk zoeken tot map: (nog niet gebruikt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Voeg toe</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Uw beslissing word opgeslagen op het medium.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Vraag niet nogmaals voor dit medium</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Stel dit medium in. De veranderingen gaan in bij het afsluiten van het programma. Om het Document Tabblad te vernieuwen moet het medium verwijderd en opnoeiw ingevoerd worden.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Beperk zoeken tot:</translation>
     </message>
     <message>
         <source>Add</source>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
index 2c344ab..a439020 100644
--- a/i18n/nl/sysinfo.ts
+++ b/i18n/nl/sysinfo.ts
@@ -1,259 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Dit vlak toont de beschikbare tests, de resultaten van de uitgevoerde tests, en vergelikingswaarden voor een geslecteerd apparaat. Gebruik de keuzevlakken om de gewenste tests uit te kiezen.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Tests</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultaat</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Vergelijking</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Integer rekenen</translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Breukrekenen</translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Tekstrendering</translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Beeldrendering</translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. RAM Prestaties</translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. SD Kaart Prestaties</translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>6. CF Kaart Prestaties</translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Start Tests!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klik hier om de geselecteerde tests uit te voeren.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Kies een model om de resultaten mee te vergelijken.</translation>
     </message>
     <message>
         <source>Compare To:</source>
-        <translation>Vergelijk met:</translation>
+        <translation type="obsolete">Vergelijk met:</translation>
     </message>
     <message>
         <source>error</source>
         <translation>fout</translation>
     </message>
+    <message>
+        <source>Compare:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Compact Flash kaart.</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>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Harde schijf.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Secure Digital kaart.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte van het interne Flash geheugen van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op de tijdelijke RAM schijf van dit apparaat.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Programma GPU gebruik (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systeem CPU gebruik (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw hanheld.
 Gehugen wordt als volgt onderverdeeld:
 
 1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
 2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
 3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
 4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw handheld.
 Gehugen wordt als volgt onderverdeeld:
 
 1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
 2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
 3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
 4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Tataal Swap: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Gebruik#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Gebruikt door</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dit is een lijst van alle kernelmodules die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of hem te beeindigen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selecteer hier een commando en klik op de Zend knop (rechts in beeld) om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik hier om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dit vlak geeft gedetailleerde informatie over deze module weer.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Wilt u dit echt uitvoeren
 </translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Gebruikt door</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Wilt u %1 echt gebruiken op dit onderdeel?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Moet %1 echt
 gebruikt worden op deze module?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index 6af9d28..c20c284 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -17,413 +17,395 @@
         <translation>Leser konfigurasjon...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Fjern
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installer
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Oppgrader
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Installer på nytt)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Oppgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Tilgjengelig plass</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Utdata</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Valg</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Bruker har klikket AVBRYT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Prosessen er blitt avbrutt ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Lagre utdata</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukjent</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Valg</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Tving avhengigheter</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Tving reinstallering</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Tving sletting</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Tving overskrivning</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informasjonsnivå</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Kun feil</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale meldinger</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informative meldinger</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Feilsøking utdata</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 - Pakke behandler</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Skriv teksten for å lete her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klikk her for å skjule snarvei verktøylinjen.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Oppdater lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klikk her for å oppdatere pakkelister fra servere.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Oppgrader</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klikk her for å oppgradere alle installerte pakker dersom en nyere versjon er tilgjengelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Last ned</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klikk her for å laste ned de valgte pakkene. </translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Oppdater endringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klikk her for installere, fjerne eller oppgradere valgte pakker.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis ikke-installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klikk her for å vise pakker som er tilgjengelige, men som ikke er installert.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klikk her for å vise pakker som er installert på denne enheten.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis oppdaterte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klikk her for å vise pakker som er installert på enheten som har en nyere versjon tilgjengelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrer etter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klikk her for vise liste over pakker som tilhører en kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Sett filtrer kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klikk her for å endre pakke kategori til brukt filter.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Finn</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klikk her for å søke etter tekst i navnene til pakkene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Finn neste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klikk her for å finne den neste pakken som inneholder teksten som du søker etter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Snarvei tastatur</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klikk her for å vise/skjule tastatur for å tillate hurtig bevegelse gjennom pakkelisten.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klikk her for å konfigurere denne applikasjonen.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klikk her for å skjule Søk verktøylinjen.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klikk her for å velge en pakke tilførselskanal.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dette er en liste over alle pakker tilgjengelige fra de ovenfor valgte servere.  
 
 Et blått punkt ved siden av navnet på pakken indikerer at pakken er installert.
 
 Et blått punkt med en stjerne viser at en nyere versjon av pakken er tilgjengelig for nedlasting.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Slett</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klikk her for å slette valgte pakker.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakkeliste for:
 </translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Oppdaterer pakkelister fra server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ADVARSEL: Oppgradering mens
 Opie/qtopia kjører
diff --git a/i18n/no/backup.ts b/i18n/no/backup.ts
index 784e2d0..25f4bf6 100644
--- a/i18n/no/backup.ts
+++ b/i18n/no/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></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/no/calibrate.ts b/i18n/no/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/no/calibrate.ts
+++ b/i18n/no/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/no/fifteen.ts b/i18n/no/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/no/fifteen.ts
+++ b/i18n/no/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/language.ts b/i18n/no/language.ts
index 34e0346..1562400 100644
--- a/i18n/no/language.ts
+++ b/i18n/no/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libaboutapplet.ts b/i18n/no/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/no/libaboutapplet.ts
+++ b/i18n/no/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/no/libcardmonapplet.ts b/i18n/no/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/no/libcardmonapplet.ts
+++ b/i18n/no/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/no/libliquid.ts b/i18n/no/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/no/libliquid.ts
+++ b/i18n/no/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libmailwrapper.ts b/i18n/no/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/no/libmailwrapper.ts
+++ b/i18n/no/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/no/libopiesecurity2.ts b/i18n/no/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/no/libopiesecurity2.ts
+++ b/i18n/no/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/no/libopieui2.ts b/i18n/no/libopieui2.ts
index d311189..0f61518 100644
--- a/i18n/no/libopieui2.ts
+++ b/i18n/no/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libwlan.ts b/i18n/no/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/no/libwlan.ts
+++ b/i18n/no/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/no/minesweep.ts b/i18n/no/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/no/minesweep.ts
+++ b/i18n/no/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/opiemail.ts b/i18n/no/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/no/opiemail.ts
+++ b/i18n/no/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index e059e72..e4cc8e0 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/sysinfo.ts b/i18n/no/sysinfo.ts
index ac6dae5..3dd8782 100644
--- a/i18n/no/sysinfo.ts
+++ b/i18n/no/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index 9117031..c1ee840 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -18,413 +18,427 @@
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Usun
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instaluj</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualizuj
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Przeinstaluj)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualizuj)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cel</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Dostepna przestrzen</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Wyjscie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uzytkownik wcisnal PRZERWIJ ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces przerwany ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Zapisz wyjscie</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Wymus zaleznosci</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Wymus reinstalacje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Wymus usuniecie</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Wymus nadpisanie</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Poziom informacji</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Tylko bledy</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalne wiadomosci</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Wiadomosci informujace</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Komunikaty problemow</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Przetwarzanie pakietu %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Usuwanie linkow symbolicznych...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Tworzenie linkow symbolicznych dla %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Tworzenie linkow symbolicznych dla %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Skonczone</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Usuwanie wpisu statusu...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>plik statusu -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pakiet - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Nie mozna otworzyc pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Nie mozna utworzyc tymczasowego pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Nie mozna rozpoczac procesu ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Nie mozna otworzyc: </translation>
+        <translation type="obsolete">Nie mozna otworzyc: </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Tworzenie katalogu</translation>
+        <translation type="obsolete">Tworzenie katalogu</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>%1 zlinkowany do %2</translation>
+        <translation type="obsolete">%1 zlinkowany do %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Nie udalo sie zlinkowanie %1 do %2</translation>
+        <translation type="obsolete">Nie udalo sie zlinkowanie %1 do %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Usuniete %1</translation>
+        <translation type="obsolete">Usuniete %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Nie udalo sie usuniecie %1</translation>
+        <translation type="obsolete">Nie udalo sie usuniecie %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Usuniete</translation>
+        <translation type="obsolete">Usuniete</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Nie udalo sie usunac</translation>
+        <translation type="obsolete">Nie udalo sie usunac</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Manager Pakietow</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Wpisz tu tekst do wyszukania.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknij tu by ukryc listwe Quick Jump.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aktualizuj liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknij tu aby aktualizowac wszystkie zainstalowane pakiety, jasli dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Sciagaj</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Zastosuj zmiany</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknij tu aby instalowac, usunac lub aktualizowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Pokaz pakiety nie zainstalowane</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Kliknij tu aby wyswietlic dostepne pakiety, ktore nie zostaly zainstalowane.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Pokaz zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Pokaz zaktualizowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety, dla ktorych dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtruj po kategorii</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Kliknij tu aby wyswietlic pakiety nalezace do jednej kategorii.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Ustaw kategorie filtrowania</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Kliknij tu aby zmienic kategorie pakietow w uzywanym filtrze.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Kliknij tu aby znalezc nastepna nazwe pakietu zawierajaca szukany tekst.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Klawiatura Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kliknij tu aby pokazac/ukryc klawiature pozwalajaca na szybkie przegladanie listy pakietow.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Kliknij tu aby skonfigurowac ta aplikacje.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Kliknij tu aby ukryc pasek wyszukiwania.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serwery:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Kliknij tu aby wybrac zrodlo pakietow (feed).</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakiety</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>To jest lista wszystkich pakietow dostepnych z wybanego powyzej zrodla (feed).
 
 Niebieska kropka obok nazwy pakietu oznacza, ze jest on aktualnie zainstalowany.
 
 Niebieska kropka z gwiazdka oznacza, ze na serwerze jest dostepna nowsza wersja pakietu.
 
 Kliknij w okienko po lewej aby wybrac pakiet.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Kliknij tu aby odinstalowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Buduje liste serwerow:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Buduje liste pakietow dla:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Odswiezam liste pakietow serwera</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>OSTRZEZENIE: Aktualizacja w czasie
diff --git a/i18n/pl/backup.ts b/i18n/pl/backup.ts
index affe684..99ab991 100644
--- a/i18n/pl/backup.ts
+++ b/i18n/pl/backup.ts
@@ -1,125 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Archiwizacja i odzyskiwanie... pracuje...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Archiwizacja i odzyskiwanie</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Błąd z systemu:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Archiwizacja nie powiodła się!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Archiwizacja i odzyskiwanie... Porażka!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Tworzenie kopii udalo sie.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Wybierz coś do odzyskania.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Odzyskanie nie powiodło się.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nie można otworzyć pliku: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Odzyskiwanie udalo sie.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Archiwizacja powiodła się.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Odzyskanie powiodło się.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Archiwizacja i odzyskiwanie</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Archiwizacja</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Zapisz do</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Archiwizuj</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Odzyskiwanie</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Wybierz źródło</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolumna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Odzyskuj</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Aktualizuj listę plików</translation>
+        <translation type="obsolete">Aktualizuj listę plików</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Informacje o błędzie</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Treść błędu:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/calibrate.ts b/i18n/pl/calibrate.ts
index 3434d1e..6ff3d60 100644
--- a/i18n/pl/calibrate.ts
+++ b/i18n/pl/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>Dotknij mocno i dokladnie krzyzyka
 zeby skalibrowac ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Witamy w Opie</translation>
+        <translation type="obsolete">Witamy w Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/fifteen.ts b/i18n/pl/fifteen.ts
index b60cb3c..9923c69 100644
--- a/i18n/pl/fifteen.ts
+++ b/i18n/pl/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>Losuj</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Poukladaj</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gratulacje!
 Wygrales gre!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>P&amp;omieszaj klocki</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Resetuj klocki</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/language.ts b/i18n/pl/language.ts
index e7dc76a..eef2c2e 100644
--- a/i18n/pl/language.ts
+++ b/i18n/pl/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Angielski</translation>
     </message>
     <message>
         <source>default</source>
         <translation>domyslny</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>Select language</source>
         <translation>Wybierz jezyk</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Ustawienia jezyka</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libaboutapplet.ts b/i18n/pl/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/pl/libaboutapplet.ts
+++ b/i18n/pl/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/pl/libcardmonapplet.ts b/i18n/pl/libcardmonapplet.ts
index 847d4b8..f0843b2 100644
--- a/i18n/pl/libcardmonapplet.ts
+++ b/i18n/pl/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Nie udalo sie odlaczenie karty CF/PCMCIA!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Nie udalo sie odlaczenie karty SD/MMC!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nowa karta:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Odlaczona:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Odlacz karte SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Odlacz karte 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Odlacz karte 1: %1</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/pl/libmailwrapper.ts b/i18n/pl/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/pl/libmailwrapper.ts
+++ b/i18n/pl/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/pl/libopiepim2.ts b/i18n/pl/libopiepim2.ts
index 78d1359..96435a5 100644
--- a/i18n/pl/libopiepim2.ts
+++ b/i18n/pl/libopiepim2.ts
@@ -1,370 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Przycisk Kalendarz</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Przycisk Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Przycisk Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Obrót ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolny+Góra</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolny+Dół</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolny+Prawo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolny+Lewo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Górny+Góra</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Górny+Dół</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Górny+Prawo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Górny+Lewo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Przycisk Akcji</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Przycisk OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Przycisk Koniec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Czerwień:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zieleń:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Błękit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Kanał alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Więcej</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Wiecej...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Plik</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Otwórz</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Zapisz</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Duże</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Średnie</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Małe</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Styl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Co</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, i</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">używając</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -422,384 +396,410 @@ i</translation>
         <translation type="obsolete">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, i</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">używając</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Czas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Wybierz czas:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Plik</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Otwórz</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Zapisz</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Rozmiar</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postęp:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Domyślny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WWW firma:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tel. firma:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax firma:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Tel. kom. firma:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager firma:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. dom:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax dom:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Tel. kom. dom:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Adresy e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawód:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menadżer:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Płeć:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Dzieci:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Przydomek:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Początek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notatka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 każdego</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 każdego</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Co</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Pliki</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Wszystkie pliki</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalny</translation>
diff --git a/i18n/pl/libopiesecurity2.ts b/i18n/pl/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/pl/libopiesecurity2.ts
+++ b/i18n/pl/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/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
index c152c89..d20f7f4 100644
--- a/i18n/pl/libopieui2.ts
+++ b/i18n/pl/libopieui2.ts
@@ -1,635 +1,661 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Przycisk Kalendarz</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Przycisk Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Przycisk Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Obrót ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolny+Góra</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolny+Dół</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolny+Prawo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolny+Lewo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Górny+Góra</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Górny+Dół</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Górny+Prawo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Górny+Lewo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Przycisk Akcji</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Przycisk OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Przycisk Koniec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Czerwień:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zieleń:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Błękit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Kanał alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Więcej</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Wiecej...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Plik</translation>
+        <translation type="unfinished">Plik</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Otwórz</translation>
+        <translation type="unfinished">Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Zapisz</translation>
+        <translation type="unfinished">Zapisz</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Duże</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Średnie</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Małe</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Styl</translation>
+        <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Rozmiar</translation>
+        <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <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">Nazwa</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, i</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">używając</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Czas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Wybierz czas:</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">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Typ Mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Plik</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Otwórz</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Zapisz</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Rozmiar</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">Nazwa</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Postęp:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Domyślny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">WWW firma:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Tel. firma:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax firma:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Tel. kom. firma:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager firma:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Tel. dom:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax dom:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Tel. kom. dom:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Adresy e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Zawód:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Menadżer:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Płeć:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Dzieci:</translation>
     </message>
     <message>
diff --git a/i18n/pl/libwlan.ts b/i18n/pl/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/pl/libwlan.ts
+++ b/i18n/pl/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/pl/minesweep.ts b/i18n/pl/minesweep.ts
index 9bb5e15..c3a8065 100644
--- a/i18n/pl/minesweep.ts
+++ b/i18n/pl/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Wygrales!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Ekspodowales!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Saper</translation>
+        <translation type="obsolete">Saper</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Poczatkujacy</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Zaawansowany</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Ekspert</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/opiemail.ts b/i18n/pl/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/pl/opiemail.ts
+++ b/i18n/pl/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 7d50f18..7564994 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,312 +1,312 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Czas i data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informacje osobiste</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Dokumenty</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problem z aplikacją</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 nie odpowiada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Czy chcesz wymusić zakończenie aplikacji?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Szybkie ładowanie tej aplikacji zostało wyłączone. Kliknij i przytrzymaj na ikonie aplikacji by je ponownie włączyć.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; został zamknięty po otrzymaniu sygnału %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikacja zamknieta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikacja nie znaleziona</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można zlokalizować aplikacji &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można znaleźć aplikacji %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Dokładnie i silnie dotknij krzyżyk
 aby skalibrować ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Witaj w Opie</translation>
+        <translation type="obsolete">Witaj w Opie</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Stan baterii</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria słaba</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Wstecz</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Dalej &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Kliknij gdziekolwiek na ekranie by kontynuować.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Proszę czekać, ładuję ustawienia %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Kończ</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>PierwszeTło</translation>
+        <translation type="obsolete">PierwszeTło</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unikod</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Brak aplikacji</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Brak aplikacji zdefiniowanych dla tego dokumentu.&lt;p&gt; Typ to %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Pokaż jako tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Wyszukiwanie Dokumentów...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Pokazuj ikony</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Pokazuj listę</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Zakładka Dokumenty&lt;p&gt;została wyłączona.&lt;p&gt;Aby ją ponownie włączyć wejdź w Ustawienia-&gt;Launcher-&gt;Dokumenty&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Widok Dokumentu</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Wszystkie typy</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Wykryto nowy nośnik danych:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Co z nim zrobić?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Tryb bezpieczny</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Menedżer wtyczek...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Restartuj Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Pomoc...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Data systemowa wydaje się być nieprawidłowa.
 (%1)&lt;/p&gt;&lt;p&gt;Czy chcesz poprawić zegar?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Poziom energii jest krytyczny!
 Wylacz urzadzenie az do naladowania baterii!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Poziom energii bardzo niski.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Bateria zapasowa sie rozladowuje.
 Doladuj baterie zapasowa.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>wizytowka</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Tryb bezpieczny</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Wystąpił błąd systemu i jest on teraz w Trybie Bezpiecznym. W tym trybie nie są ładowane wtyczki. Używajac Menedżera Wtyczek możesz wyłączyć wtyczki, które powodują awarię systemu.</translation>
     </message>
     <message>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index 0c26763..c924c8f 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Compact 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>Ten wykres reprezentuje aktualne uzycie pamieci na tym twardym dysku.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci w pamieci wbudowanej tego urzadzenia (np. pamieci Flash).</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tymczasowym RAM-dysku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uzycie procesora przez aplikacje (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uzycie procesora przez system (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywana (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Bufory (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Podreczna (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Wolna (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Calkowita Pamiec: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Ta strona prezentuje alokacje pamieci (np. RAM) na Twoim urzadzeniu.
 Pamiec jest podzielona na kategorie:
 
 1. Uzywana - pamiec uzywana przez Opie i inne dzialajace aplikacje.
 2. Bufory - tymczasowa przestrzen uzywana do poprawienia wydajnosci.
 3. Podreczna - informacje, ktore zostaly juz uzyte, ale nie zostaly jeszcze zwolnione.
 4. Wolna - pamiec nie bedaca aktualnie w uzyciu przez zadne aplikacje.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uzyty#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>To jest lista wszystkich aktualnie zaladowanych modulow jadra.
 
 Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub wy go usunac z pamieci.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wybierz tu polecenie i kliknij przycisk Wyslij po prawej zeby wyslac polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Kliknij tu zeby wyslac wybrane polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Uzywany przez</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Czy na pewno chcesz wykonac %1 na tym module?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Zajete (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Wolne (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
diff --git a/i18n/pt/aqpkg.ts b/i18n/pt/aqpkg.ts
index 795bd7c..1557a0e 100644
--- a/i18n/pt/aqpkg.ts
+++ b/i18n/pt/aqpkg.ts
@@ -19,413 +19,427 @@
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Apagar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalar
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Actualizar
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Re-Instalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Actualizar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espaço Disponível</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Resultado</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Abortado pelo utilizador ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Processo Abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Gravar Resultado</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Ignorar Dependências</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forçar Reinstalação</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forçar Remoção</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forçar Sobreposição</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Nível de Informação</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Apenas Erros</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Mensagens Normais</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Mensagens de informação</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Analisar resultado</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>A processar o pacote %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>A remover links simbólicos...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>A criar os links simbólicos para %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>A criar os links simbólicos para %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Concluído</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>A remover o ficheiro de estado...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>ficheiro de estado -</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>pacote - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Não foi possível abrir o ficheiro de status - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Não foi possível criar o ficheiro de estado temporário - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Não foi possível executar o ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Não foi possível abrir: </translation>
+        <translation type="obsolete">Não foi possível abrir: </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>A criar a directoria</translation>
+        <translation type="obsolete">A criar a directoria</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Ligado %1 a %2</translation>
+        <translation type="obsolete">Ligado %1 a %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Falhou a ligação de %1 a %2</translation>
+        <translation type="obsolete">Falhou a ligação de %1 a %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>%1 apagado</translation>
+        <translation type="obsolete">%1 apagado</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Falhou a remoção de %1</translation>
+        <translation type="obsolete">Falhou a remoção de %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Apagado</translation>
+        <translation type="obsolete">Apagado</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Falhou a remoção</translation>
+        <translation type="obsolete">Falhou a remoção</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Software</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Introduza o texto para procurar aqui.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Clique aqui para esconder a barra de ferramentas de salto rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar Listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Clique aqui para actualizar todos os pacotes que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Clique aqui para obter os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar Alterações</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Clique aqui para instalar, remover ou actualizar os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acções</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar pacotes por instalar</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Clique aqui para mostrar os pacotes disponíveis que não estão instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar pacotes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Clique aqui para motrar os pacotes instalados neste dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar pacotes por actualizar</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Clique aqui para motrar os pacotes instalados neste dispositivo e que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Clique aqui para mostrar os pacotes que pertençam a uma determinada categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Clique aqui para mudar a filtragem de pacotes por categoria.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Clique aqui para procurar pacotes por texto no nome.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Procurar Próxima</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Clique aqui para procurar o próximo pacote que contenha o texto que procura no nome.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclado de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Clique aqui para mostrar ou esconder o teclado que permite um movimento rápido na lista de pacotes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Clique aqui para configurar esta aplicação.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Clique aqui para esconder a barra de pesquisa.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Clique aqui para seleccionar uma fonte de pacotes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacotes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Esta é a lista de todos os pacotes disponíveis no servidor seleccionado.
 
 Um ponto azul perto do nome do pacote indica que está instalado.
 
 Um ponto azul com uma estrela indica que existe uma nova versão disponível neste servidor.
 
 Clique na caixa à esquerda para seleccionar um pacote.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Clique aqui para desinstalar os pacotes seleccionado.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>A criar a lista de servidores:
     %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>A criar a lista de servidores para:
     %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>A actualizar a lista de pacotes disponíveis</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENÇÃO: Não é recomendada
diff --git a/i18n/pt/backup.ts b/i18n/pt/backup.ts
index fc74a6a..de96681 100644
--- a/i18n/pt/backup.ts
+++ b/i18n/pt/backup.ts
@@ -1,125 +1,145 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Cópia de Segurança... a processar...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Erro do sitema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Falhou a Cópia de Segurança!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Falhou a Cópia de Segurança!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Cópia de Segurança bem sucedida.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Escolha algo para repôr.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Falhou a Reposição.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Não foi possível abrir o ficheiro %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Reposição bem sucedida.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicações</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Gravar Para</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Cópia de Segurança</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Reposição</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Escolha a fonte</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Coluna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Reposição</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Actualizar a lista de ficheiros</translation>
+        <translation type="obsolete">Actualizar a lista de ficheiros</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Informação de Erro</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Mensagem de Erro:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/calibrate.ts b/i18n/pt/calibrate.ts
index 25270bd..4c9cd2d 100644
--- a/i18n/pt/calibrate.ts
+++ b/i18n/pt/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>Clique na cruz com firmeza e precisão
 para calibrar o seu ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bem-Vindo ao Opie</translation>
+        <translation type="obsolete">Bem-Vindo ao Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/fifteen.ts b/i18n/pt/fifteen.ts
index 6fe6db7..eb3fd39 100644
--- a/i18n/pt/fifteen.ts
+++ b/i18n/pt/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>Aleatório</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Resolver</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Puzzle</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Puzzle</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Parabéns! 
 Ganhou!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Misturar</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reiniciar peças</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/language.ts b/i18n/pt/language.ts
index 378eaad..9313a0a 100644
--- a/i18n/pt/language.ts
+++ b/i18n/pt/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglês</translation>
     </message>
     <message>
         <source>default</source>
         <translation>omissão</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>Select language</source>
         <translation>Escolha a linguagem</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Configuração da Linguagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libaboutapplet.ts b/i18n/pt/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/pt/libaboutapplet.ts
+++ b/i18n/pt/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/pt/libcardmonapplet.ts b/i18n/pt/libcardmonapplet.ts
index c790cac..3548475 100644
--- a/i18n/pt/libcardmonapplet.ts
+++ b/i18n/pt/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Ejecção do cartão CF/PCMCIA falhou!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Ejecção do cartão SD/MMC falhou!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Novo cartão:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Removido:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Ejectar SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Ejectar cartão 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Ejectar cartão 1: %1</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/pt/libmailwrapper.ts b/i18n/pt/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/pt/libmailwrapper.ts
+++ b/i18n/pt/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/pt/libopiepim2.ts b/i18n/pt/libopiepim2.ts
index 4c705ad..8479d51 100644
--- a/i18n/pt/libopiepim2.ts
+++ b/i18n/pt/libopiepim2.ts
@@ -1,374 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão do Calendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão de Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão do Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Mostrar Rodar</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Em Baixo+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Em Baixo+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Em Baixo+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Em Baixo+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Em Cima+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Em Cima+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Em Cima+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Em Cima+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoFicheiro</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gravar</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeno</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">em</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -438,384 +408,414 @@ e</translation>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">em</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Escolha Hora:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">DiálogoFicheiro</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Gravar</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Emprego:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Pessoal:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Data Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Filhos:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Início:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheiros</translation>
diff --git a/i18n/pt/libopiesecurity2.ts b/i18n/pt/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/pt/libopiesecurity2.ts
+++ b/i18n/pt/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/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
index faee6c4..b3b500b 100644
--- a/i18n/pt/libopieui2.ts
+++ b/i18n/pt/libopieui2.ts
@@ -1,647 +1,677 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão do Calendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão de Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão do Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Mostrar Rodar</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Em Baixo+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Em Baixo+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Em Baixo+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Em Baixo+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Em Cima+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Em Cima+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Em Cima+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Em Cima+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>DiálogoFicheiro</translation>
+        <translation type="unfinished">DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Gravar</translation>
+        <translation type="unfinished">Gravar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeno</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
+        <translation type="unfinished">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">em</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha Hora:</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">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">DiálogoFicheiro</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Gravar</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</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">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager Emprego:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Pessoal:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Esposa:</translation>
     </message>
     <message>
diff --git a/i18n/pt/libwlan.ts b/i18n/pt/libwlan.ts
index c3efba3..e85a06c 100644
--- a/i18n/pt/libwlan.ts
+++ b/i18n/pt/libwlan.ts
@@ -1,152 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Configuração de Rede sem Fios</translation>
+        <translation type="obsolete">Configuração de Rede sem Fios</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Geral</translation>
+        <translation type="obsolete">Geral</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modo</translation>
+        <translation type="obsolete">Modo</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Especificar o Ponto de &amp;Acesso</translation>
+        <translation type="obsolete">Especificar o Ponto de &amp;Acesso</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Especificar o &amp;Canal</translation>
+        <translation type="obsolete">Especificar o &amp;Canal</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>qualquer</translation>
+        <translation type="obsolete">qualquer</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infraestrutura</translation>
+        <translation type="obsolete">Infraestrutura</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>&quot;Managed&quot;</translation>
+        <translation type="obsolete">&quot;Managed&quot;</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>&quot;Ad-Hoc&quot;</translation>
+        <translation type="obsolete">&quot;Ad-Hoc&quot;</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Encriptação</translation>
+        <translation type="obsolete">Encriptação</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Activar Encriptação</translation>
+        <translation type="obsolete">&amp;Activar Encriptação</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>Configuração da &amp;Chave</translation>
+        <translation type="obsolete">Configuração da &amp;Chave</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Chave &amp;1</translation>
+        <translation type="obsolete">Chave &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Chave &amp;2</translation>
+        <translation type="obsolete">Chave &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Chave &amp;3</translation>
+        <translation type="obsolete">Chave &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Chave &amp;4</translation>
+        <translation type="obsolete">Chave &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Pacotes não encriptados</translation>
+        <translation type="obsolete">Pacotes não encriptados</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Aceitar</translation>
+        <translation type="obsolete">&amp;Aceitar</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Rejeitar</translation>
+        <translation type="obsolete">&amp;Rejeitar</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Geral</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">&quot;Managed&quot;</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">&quot;Ad-Hoc&quot;</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Modo</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Activar Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">Configuração da &amp;Chave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Chave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Chave &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Chave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Chave &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">PA</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Velocidade</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Canal</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Estação</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Noise</source>
+        <translation type="unfinished">Ruído</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Qualidade</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Sinal</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Informação da Interface</translation>
+        <translation type="obsolete">Informação da Interface</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Canal</translation>
+        <translation type="obsolete">Canal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modo</translation>
+        <translation type="obsolete">Modo</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Estação</translation>
+        <translation type="obsolete">Estação</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>PA</translation>
+        <translation type="obsolete">PA</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Velocidade</translation>
+        <translation type="obsolete">Velocidade</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualidade</translation>
+        <translation type="obsolete">Qualidade</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Ruído</translation>
+        <translation type="obsolete">Ruído</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Sinal</translation>
+        <translation type="obsolete">Sinal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/minesweep.ts b/i18n/pt/minesweep.ts
index 808f81f..c3b34ec 100644
--- a/i18n/pt/minesweep.ts
+++ b/i18n/pt/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Ganhou!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Explodiu!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Minas</translation>
+        <translation type="obsolete">Minas</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Nível 1</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Nível 2</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Nível 3</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/opiemail.ts b/i18n/pt/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/pt/opiemail.ts
+++ b/i18n/pt/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 0e5b0ed..391395a 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,307 +1,303 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Hora e Data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informação Pessoal</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Foi desactivado o carregamento rápido da aplicação. Toque e espere no icon da aplicação para reactivar.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;A aplicação %1 terminou com o código %2.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>A aplicação terminou</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Não foi encontrada a aplicação</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível localizar a aplicação &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar a aplicação %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Estado da Bateria</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria Fraca</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Voltar</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Próxima &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Toque no ecrâ para continuar.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Aguarde um momento. A carregar a configuração de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Aguarde um momento...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>Ecrâ de Fundo no Primeiro Uso</translation>
+        <translation type="obsolete">Ecrâ de Fundo no Primeiro Uso</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Finalizar</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Execução</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ver como texto</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;A procurar documentos...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vista em Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Todos os tipos</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Modo Salvaguarda</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Ajuda...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;A data do sistema não parece ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">O nível de energia está muito baixo.
 Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">O nível de energia da bateria está muito baixo.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">O nível de energia da bateria extra está baixo.
 Deve carregá-la.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Modo de Salvaguarda</translation>
     </message>
     <message>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 78f5210..39c0696 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Este gráfico representa o espaço ocupado neste cartão de memória Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa o espaço ocupado neste disco.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa o espaço ocupado neste cartão de memória Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa o espaço ocupado na memória interna (p.ex. Flash Memory) neste dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa o espaço ocupado na memória RAM.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Este gráfico representa a ocupação do processador.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Esta página mostra quanta memória (i.e. RAM) está alocada no seu dispositivo.
 A memória está categorizada da seguinte forma:
 
 1. Usada - memória usada pelo Opie e pelas aplicações a correr.
 2. Buffers - memória temporária usada para melhorar a performance.
 3. Cached - memória temporária para manter a ultima informação usada 
 4. Free - memória não usada.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta é a lista de todos os módulos do kernel actualmente em utilização neste dispositivo.
 
 Clique e espere num módulo para ver informação adicional, ou para o remover da memória.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione um comando aqui e depois clique no botão &quot;Enviar&quot; para enviar o comando ao módulo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Clique aqui para enviar o comando seleccionado ao módulo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta àrea mostra a informação detalhada deste módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Deseja mesmo executar %1 para este módulo?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
diff --git a/i18n/pt_BR/aqpkg.ts b/i18n/pt_BR/aqpkg.ts
index 6db6ebe..af89d9f 100644
--- a/i18n/pt_BR/aqpkg.ts
+++ b/i18n/pt_BR/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/pt_BR/backup.ts b/i18n/pt_BR/backup.ts
index 784e2d0..25f4bf6 100644
--- a/i18n/pt_BR/backup.ts
+++ b/i18n/pt_BR/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></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/pt_BR/calibrate.ts b/i18n/pt_BR/calibrate.ts
index 435f27c..8052e9f 100644
--- a/i18n/pt_BR/calibrate.ts
+++ b/i18n/pt_BR/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>Toque os alvos firme e acuradamente
 para calibrar sua tela.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bemvindo ao Opie</translation>
+        <translation type="obsolete">Bemvindo ao Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/fifteen.ts b/i18n/pt_BR/fifteen.ts
index f9b0806..d895062 100644
--- a/i18n/pt_BR/fifteen.ts
+++ b/i18n/pt_BR/fifteen.ts
@@ -1,43 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Resolver</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Sortear</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Peças</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Peças</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Parabéns!
 Você venceu o Jogo!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>&amp;Sortear Peças</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Reiniciar Peças</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/language.ts b/i18n/pt_BR/language.ts
index 4fcab64..2e265f9 100644
--- a/i18n/pt_BR/language.ts
+++ b/i18n/pt_BR/language.ts
@@ -1,25 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglês</translation>
     </message>
     <message>
         <source>default</source>
         <translation>padrao</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>Select language</source>
         <translation>Seleçione a linguagem</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Configuração de Linguagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libaboutapplet.ts b/i18n/pt_BR/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/pt_BR/libaboutapplet.ts
+++ b/i18n/pt_BR/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/pt_BR/libcardmonapplet.ts b/i18n/pt_BR/libcardmonapplet.ts
index f7c070b..f8634c6 100644
--- a/i18n/pt_BR/libcardmonapplet.ts
+++ b/i18n/pt_BR/libcardmonapplet.ts
@@ -1,42 +1,34 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></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/pt_BR/libliquid.ts b/i18n/pt_BR/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/pt_BR/libliquid.ts
+++ b/i18n/pt_BR/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libmailwrapper.ts b/i18n/pt_BR/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/pt_BR/libmailwrapper.ts
+++ b/i18n/pt_BR/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/pt_BR/libopiepim2.ts b/i18n/pt_BR/libopiepim2.ts
index d0cb6e4..a32db17 100644
--- a/i18n/pt_BR/libopiepim2.ts
+++ b/i18n/pt_BR/libopiepim2.ts
@@ -1,374 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão Claendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão Contatos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Superior+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoArquivo</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salvar</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Média</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequena</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">na(o)</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
@@ -440,384 +410,414 @@ A cada:</translation>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Escolha a Hora:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">DiálogoArquivo</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Salvar</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Crianças:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>A cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 a cada</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>No(a) %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>A Cada</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Arquivos</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos os arquivos</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
diff --git a/i18n/pt_BR/libopiesecurity2.ts b/i18n/pt_BR/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/pt_BR/libopiesecurity2.ts
+++ b/i18n/pt_BR/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/pt_BR/libopieui2.ts b/i18n/pt_BR/libopieui2.ts
index 3727c21..69234ab 100644
--- a/i18n/pt_BR/libopieui2.ts
+++ b/i18n/pt_BR/libopieui2.ts
@@ -1,648 +1,678 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão Claendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão Contatos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Superior+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>DiálogoArquivo</translation>
+        <translation type="unfinished">DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="unfinished">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Salvar</translation>
+        <translation type="unfinished">Salvar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Média</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequena</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="unfinished">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+        <translation type="unfinished">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha a Hora:</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">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">DiálogoArquivo</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Salvar</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Estilo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</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">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Crianças:</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/libwlan.ts b/i18n/pt_BR/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/pt_BR/libwlan.ts
+++ b/i18n/pt_BR/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/pt_BR/minesweep.ts b/i18n/pt_BR/minesweep.ts
index cabf6fa..c878839 100644
--- a/i18n/pt_BR/minesweep.ts
+++ b/i18n/pt_BR/minesweep.ts
@@ -1,34 +1,38 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MineSweep</name>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Caça Minas</translation>
+        <translation type="obsolete">Caça Minas</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Você Venceu !</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Você Explodiu !</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Iniciante</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opiemail.ts b/i18n/pt_BR/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/pt_BR/opiemail.ts
+++ b/i18n/pt_BR/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index ad92cde..15dd221 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,310 +1,302 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/sysinfo.ts b/i18n/pt_BR/sysinfo.ts
index 03c75f7..8968599 100644
--- a/i18n/pt_BR/sysinfo.ts
+++ b/i18n/pt_BR/sysinfo.ts
@@ -1,258 +1,258 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU pelo sistema (%)</translation>
     </message>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por aplicações (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memória Total: %1 kB</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Em cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ru/aqpkg.ts b/i18n/ru/aqpkg.ts
index 6a1de2e..5a94113 100644
--- a/i18n/ru/aqpkg.ts
+++ b/i18n/ru/aqpkg.ts
@@ -19,413 +19,427 @@
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Убрать
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Установить
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Обновить
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Переустановить)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Обновить)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Место назначения</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Место доступно</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Вывод</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Начать</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Отменить</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Пользователь нажал Отменить ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Процесс отменен **** </translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Сохранить вывод</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>%1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Игнор. зависимости</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Вынужд. переустановка</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Вынужд. удаление</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Вынужд. перезапись</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Уровень информации</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Только ошибки</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Обычные сообщения</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Полезные сообщения</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Выявление неисправностей</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>Обрабатываю пакет %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>Убираю ссылки...
 </translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>Создаю ссылки для %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>Создаю ссылки для %1</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Закончил</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>Убираю заметку о статусе...</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>файл статуса - </translation>
     </message>
     <message>
         <source>package - </source>
         <translation>пакет - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>Не могу открыть файл статуса - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Не могу создать временный файл статуса - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Не могу запустить процесс ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Не могу открыть :</translation>
+        <translation type="obsolete">Не могу открыть :</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Создаю каталог</translation>
+        <translation type="obsolete">Создаю каталог</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Привязал %1 к %2</translation>
+        <translation type="obsolete">Привязал %1 к %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Не смог привязать %1 к %2</translation>
+        <translation type="obsolete">Не смог привязать %1 к %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>Убрал %1</translation>
+        <translation type="obsolete">Убрал %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Не смог убрать %1</translation>
+        <translation type="obsolete">Не смог убрать %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Убран</translation>
+        <translation type="obsolete">Убран</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Не смог убрать</translation>
+        <translation type="obsolete">Не смог убрать</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Менеджер пакетов</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Введите текст для поиска здесь.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Нажмите чтобы скрыть Quick Jump панель.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Обновить списки</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Нажмите чтобы обновить списки пакетов с серверов.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Обновить</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Нажмите чтобы обновить все установленные пакеты если есть более свежая версия.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Нажмите чтобы скачать выделенные пакеты.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Применить изменения</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Нажмите чтобы установить, убрать или обновить выделенные пакеты.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Показать неустановленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Нажмите чтобы показать доступные, но не установленные пакеты.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Показать установленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Нажмите чтобы показать пакеты установленные на этом устройстве.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Показать обновленные пакеты</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Нажмите чтобы показать пакеты установленные на этом устройстве для которых имеется более свежая версия.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Фильтровать по разделу</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Нажмите чтобы показать список пакетов в одной категории.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Уст. категорию для фильтра</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Нажмите чтобы сменить категорию пакетов на используемый фильтр.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Нажмите чтобы найти текст в названиях пакетов.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Найти дальше</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Нажмите чтобы найти следующий пакет содержащий нужный вам текст в названии.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump клавиатура</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Нажмите чтобы показать/скрыть клавиатуру разрешающую быстрое перемещение по списку.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Настроить</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Нажмите чтобы настроить это приложение.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Нажмите чтобы скрыть панель поиска.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Сервера:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Нажмите чтобы выбрать источник пакетов.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Пакеты</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Это список всех пакетов из выделенного выше источника.
 
 Синяя точка рядом с названием показывает что пакет установлен.
 
 Синяя точка со звездой показывает что более свежая версия доступна из источника.
 
 Нажмите внутри квадрата слева чтобы выделить пакет.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Нажмите чтобы удалить выбранные пакеты.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Выстраиваю список серверов:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Выстраиваю список серверов для:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Обновляю список пакетов с сервера</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ВНИМАНИЕ: Обновлять пакеты
diff --git a/i18n/ru/backup.ts b/i18n/ru/backup.ts
index b75780a..2f683db 100644
--- a/i18n/ru/backup.ts
+++ b/i18n/ru/backup.ts
@@ -1,124 +1,144 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Резервное копирование... в процессе...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Резервное копирование</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Ошибка системы:</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Сохранить не удалось!</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Резервное копирование... Сбой !!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">Сохранили успешно.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>Выберите что-нибудь для восстановления.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Восстановить не удалось.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Не могу открыть файл: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">Восстановили успешно.</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation>Сохранили успешно.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Восстановили успешно.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Резервное копирование</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Сохранить</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Приложения</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Записать на</translation>
     </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>
-        <translation>Обновить список</translation>
+        <translation type="obsolete">Обновить список</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Информация об ошибке</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Сообщение об ошибке:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Да</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/calibrate.ts b/i18n/ru/calibrate.ts
index 7d7035e..2b0bc08 100644
--- a/i18n/ru/calibrate.ts
+++ b/i18n/ru/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/ru/fifteen.ts b/i18n/ru/fifteen.ts
index 902e4be..df8f910 100644
--- a/i18n/ru/fifteen.ts
+++ b/i18n/ru/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/ru/kpacman.ts b/i18n/ru/kpacman.ts
index d1cc8b2..777059d 100644
--- a/i18n/ru/kpacman.ts
+++ b/i18n/ru/kpacman.ts
@@ -34,217 +34,217 @@
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Доска почета</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Выйти</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Скрыть курсор мыши</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Выбрать тему графики</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Приостановить в фоне</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished">П&amp;родолжить</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Изменить &amp;клавиши...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Игра Packman для KDE
 
 Эта программа основана на исходниках ksnake,
 созданной Michel Filippi (mfilippi@sade.rhein-main.de).
 Pacman (c) 1980 MIDWAY MFG.CO очень сильно
 повлиял на этот дизайн.
 
 Я хочу поблагодарить мою подругу Elke Krueers
 за последнии 10 лет дружбы.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Не могу создать битшрифт.
 
 Файл &apos;@FONTNAME@&apos; не существует или
 имеет неизвестный формат.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>ИГРА  ОКОНЧЕНА</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>ИГРОК НОМЕР ОДИН</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>ГОТОВ!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ПЕРСОНАЖ</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>КЛИЧКА</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-ТЕНЬ</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;МЕРЦАЮЩИЙ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-СКОРОСТНОЙ</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;РОЗОВАТЫЙ&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-СКРОМНЫЙ</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;ЧЕРНИЛЬНЫЙ&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-КОЛЮЧИЙ</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;КЛАЙД&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA ПОРТ: КАТАЛИН КЛИМОВ</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>НАЖМИТЕ НА КУРСОР ЧТОБЫ НАЧАТЬ</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>РЕКОРД</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     ПОЗДРАВЛЯЕМ     </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    ВЫ ДОСТИГЛИ    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  КОЛ-ВО ОЧКОВ В ТОП 10.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>ПОЗ   ОЧКИ  ИМЯ   ДАТА</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@ГГ@/@ММ@/@ДД@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Не могу создать изображение.
 
 Файл &apos;@PIXMAPNAME@&apos; не существует или
 имеет неизвестный формат.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Ошибка инициализации</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/language.ts b/i18n/ru/language.ts
index 3bf5a3f..f8e415a 100644
--- a/i18n/ru/language.ts
+++ b/i18n/ru/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>Select language</source>
         <translation>Выберите язык</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Установка языка</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libaboutapplet.ts b/i18n/ru/libaboutapplet.ts
index d0ead1f..2fc95d8 100644
--- a/i18n/ru/libaboutapplet.ts
+++ b/i18n/ru/libaboutapplet.ts
@@ -1,135 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Ссылка &quot;О программе&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation>О программе</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="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</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="obsolete">&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
 &lt;/p&gt;
 &lt;p&gt;
 Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
 &lt;/p&gt;
 &lt;p&gt;
 Зайдите на &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; чтобы получить дальнейшую информацию о проекте Opie.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Авторы</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>&lt;p&gt;
+        <translation type="obsolete">&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;</translation>
     </message>
     <message>
         <source>Report</source>
         <translation>Сообщить</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>
         <translation type="obsolete">&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны нам сообщить когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
 &lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на
 &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; чтобы сообщить об ошибках.&lt;/p&gt;
 &lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
         <translation>Присоединяйтесь</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>
         <translation type="obsolete">&lt;p&gt;Вам не нужно быть разработчиком программного обеспечения чтобы стать членом команды Opie. Вы можете присоединиться к интернациональным командам которые переводят интерфейс программ. Вы можете предоставлять графику, темы, звуки, или улучшенную документацию. Выбирайте сами!&lt;/p&gt;
 &lt;p&gt;Зайдите на &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; чтобы узнать про проекты в которых вы можете участвовать.&lt;/p&gt;
 &lt;p&gt;Если вам нужно больше информации или документации, &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; даст вам все, что необходимо.&lt;/p&gt;</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>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</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>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
 &lt;/p&gt;
 &lt;p&gt;
 Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
 &lt;/p&gt;
 &lt;p&gt;
 Зайдите на &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; чтобы получить дальнейшую информацию о проекте Opie.
 &lt;/p&gt;</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>&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны сообщить нам когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
 &lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на &lt;i&gt;http://opie.han0dhelds.org/&lt;/i&gt; чтобы сообщить об ошибках.&lt;/p&gt;
 &lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</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>&lt;p&gt;Вам не нужно быть разработчиком программного обеспечения чтобы стать членом команды Opie. Вы можете присоединиться к интернациональным командам которые переводят интерфейс программ. Вы можете предоставлять графику, темы, звуки, или улучшенную документацию. Выбирайте сами!&lt;/p&gt;
 &lt;p&gt;Зайдите на &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; чтобы узнать про проекты в которых вы можете участвовать.&lt;/p&gt;
 &lt;p&gt;Если вам нужно больше информации или документации, &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; даст вам все, что необходимо.&lt;/p&gt;</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">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</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/ru/libcardmonapplet.ts b/i18n/ru/libcardmonapplet.ts
index 6209821..cede30e 100644
--- a/i18n/ru/libcardmonapplet.ts
+++ b/i18n/ru/libcardmonapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <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>Eject SD/MMC card</source>
         <translation>Выдвинуть SD/MMC карту</translation>
     </message>
     <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>New card: SD/MMC</source>
-        <translation>Новая карта: SD/MMC</translation>
+        <translation type="obsolete">Новая карта: SD/MMC</translation>
     </message>
     <message>
         <source>Ejected: SD/MMC</source>
-        <translation>Выдвинута: SD/MMC</translation>
+        <translation type="obsolete">Выдвинута: SD/MMC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libliquid.ts b/i18n/ru/libliquid.ts
index 1f43aff..d87ecd6 100644
--- a/i18n/ru/libliquid.ts
+++ b/i18n/ru/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Жидкость</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Стиль Жидкость</translation>
+        <translation type="unfinished">Стиль Жидкость</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Без прозрачности</translation>
+        <translation type="unfinished">Без прозрачности</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Полосы, цвет фона</translation>
+        <translation type="unfinished">Полосы, цвет фона</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Полосы, цвет кнопок</translation>
+        <translation type="unfinished">Полосы, цвет кнопок</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Прозрачный с полосами, цвет фона</translation>
+        <translation type="unfinished">Прозрачный с полосами, цвет фона</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Прозрачный с полосами, цвет кнопок</translation>
+        <translation type="unfinished">Прозрачный с полосами, цвет кнопок</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Свой уровень прозрачности</translation>
+        <translation type="unfinished">Свой уровень прозрачности</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Цвет меню</translation>
+        <translation type="unfinished">Цвет меню</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Цвет текста</translation>
+        <translation type="unfinished">Цвет текста</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Непрозрачность</translation>
+        <translation type="unfinished">Непрозрачность</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Текст меню отбрасывает тень</translation>
+        <translation type="unfinished">Текст меню отбрасывает тень</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Показывать плоские кнопки инструментов</translation>
+        <translation type="unfinished">Показывать плоские кнопки инструментов</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Контраст полос</translation>
+        <translation type="unfinished">Контраст полос</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Жидкость</translation>
+        <translation type="unfinished">Жидкость</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Стиль High Performance Liquid, сделал Mosfet</translation>
+        <translation type="unfinished">Стиль High Performance Liquid, сделал Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libmailwrapper.ts b/i18n/ru/libmailwrapper.ts
index 45e9418..3fc0a4f 100644
--- a/i18n/ru/libmailwrapper.ts
+++ b/i18n/ru/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation>ошибка при подключении к серверу IMAP: %1</translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation>ошибка при регистрации на сервере IMAP: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation>В ящике нет сообщений</translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation>В ящике есть %1 сообщений</translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation>Ошибка при получении заголовков: %1</translation>
     </message>
     <message>
         <source>Mailbox has no mails!</source>
         <translation>В ящике нет сообщений!</translation>
     </message>
     <message>
         <source>error deleting mail: %s</source>
         <translation>ошибка при удалении сообщения: %s</translation>
     </message>
     <message>
         <source>Cannot create folder %1 for holding subfolders</source>
         <translation>Не могу создать папку %1 для содержания подпапок</translation>
     </message>
     <message>
         <source>%1</source>
         <translation>%1</translation>
     </message>
     <message>
         <source>error copy mails: %1</source>
         <translation>ошибка копирования сообщения: %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>ошибка копирования сообщений: %1</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>Регистрация</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
 </context>
 <context>
     <name>MBOXwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>В ящике есть %1 сообщение(й)</translation>
     </message>
     <message>
         <source>Mailbox exists.</source>
         <translation>Ящик существует.</translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation>Ошибка иниц. папки</translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation>Ошибка записи в папку сообщения</translation>
     </message>
     <message>
         <source>Error initializing mbox</source>
         <translation>Ошибка иниц. ящика</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Ошибка получения почты: %i</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Ошибка удаления почты: %1</translation>
     </message>
     <message>
         <source>Mailbox doesn&apos;t exist.</source>
         <translation>Ящик не существует.</translation>
     </message>
     <message>
         <source>Error deleting Mailbox.</source>
         <translation>Ошибка удаления ящика.</translation>
     </message>
 </context>
 <context>
     <name>MHwrapper</name>
     <message>
         <source>Mailbox has %1 mail(s)</source>
         <translation>В ящике есть %1 сообщение(й)</translation>
     </message>
     <message>
         <source>Error fetching mail %i</source>
         <translation>Ошибка получения почты %i</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Ошибка удаления почты %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Ошибка получения статуса</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>Ящик содержит %1 сообщение(й)</translation>
     </message>
     <message>
         <source>Error initializing folder</source>
         <translation>Ошибка иниц. папки</translation>
     </message>
     <message>
         <source>error deleting mail</source>
         <translation>ошибка удаления почты</translation>
     </message>
     <message>
         <source>Error getting folder info</source>
         <translation>Ошибка получения информ. о папке</translation>
     </message>
     <message>
         <source>Error deleting mail %1</source>
         <translation>Ошибка удаления почты %1</translation>
     </message>
 </context>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation>Нет ошибок</translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation>Неожиданный код ошибки</translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation>Сервис недоступен</translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation>Ошибка потока</translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation>gethostname() не удался</translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation>Еще не осуществлено</translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation>Ошибка, действие не выполнено</translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation>Данные превышают отведенное место</translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation>Ошибка при обработке</translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation>Ящик недоступен</translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation>Имя ящика не разрешено</translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation>Неизвестная последовательность команд</translation>
     </message>
     <message>
         <source>User not local</source>
         <translation>Пользователь не местный</translation>
     </message>
     <message>
         <source>Transaction failed</source>
         <translation>Транзакция неудалась</translation>
     </message>
     <message>
         <source>Memory error</source>
         <translation>Ошибка памяти</translation>
     </message>
     <message>
         <source>Connection refused</source>
         <translation>Соединение отвергнуто</translation>
     </message>
     <message>
         <source>Unknown error code</source>
         <translation>Неизвестный код ошибки</translation>
     </message>
     <message>
         <source>Error sending mail</source>
         <translation>Ошибка отправки почты</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Ошибка отправки почты - отключаю</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>%1 из %2 байтов отправлено</translation>
     </message>
     <message>
         <source>Sending mail %1 of %2</source>
         <translation>Отправляю сообщение %1 из %2</translation>
     </message>
 </context>
 <context>
     <name>progressMailSendUI</name>
     <message>
         <source>Sending mail</source>
         <translation>Отправляю почту</translation>
     </message>
     <message>
         <source>Progress of mail</source>
         <translation>Продвижение почты</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopiepim2.ts b/i18n/ru/libopiepim2.ts
index 89a1014..8134816 100644
--- a/i18n/ru/libopiepim2.ts
+++ b/i18n/ru/libopiepim2.ts
@@ -1,378 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Кнопка записи</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Повернуть дисплей</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Нижний+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Нижний+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Нижний+направо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Нижний+налево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Верхний+вверх</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Верхний+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Верхний+направо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Верхний+налево</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Кнопка  ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Кнопка &quot;End&quot;</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Тон:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Насыщ.:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Красный:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зеленый:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Синий:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Альфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Выбрать цвет</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Далее</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Далее...</translation>
     </message>
 </context>
 <context>
-    <name>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>Повторяющееся событие</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>неделю</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation>лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation>по</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -430,384 +400,414 @@ and </source>
         <translation type="obsolete">Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">неделя</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">год</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
     <message>
         <source>on </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>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Прогресс:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Предел:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail по умолчанию:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Офис:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Раб. телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Раб. факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Раб. моб.:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Раб. пейджер:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Дом. тел.:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Дом. факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Дом. моб.:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Все Email:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годовщина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Дети:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Прозвище:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Начало:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Окон.:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Заметка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 каждые</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понедельник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четверг</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пятница</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Суббота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Воскресение</translation>
     </message>
     <message>
         <source>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>Very high</source>
         <translation>Очень высокий</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Высокий</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормальный</translation>
diff --git a/i18n/ru/libopiesecurity2.ts b/i18n/ru/libopiesecurity2.ts
index 5ceb53d..49c3cde 100644
--- a/i18n/ru/libopiesecurity2.ts
+++ b/i18n/ru/libopiesecurity2.ts
@@ -1,40 +1,78 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation>Добро пожаловать в систему методов аутентификации Opie</translation>
+        <translation type="obsolete">Добро пожаловать в систему методов аутентификации Opie</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
-        <translation>Загружаю плагины аутентификации...</translation>
+        <translation type="obsolete">Загружаю плагины аутентификации...</translation>
     </message>
     <message>
         <source>Proceed...</source>
-        <translation>Продолжить...</translation>
+        <translation type="obsolete">Продолжить...</translation>
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation>Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
+        <translation type="obsolete">Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
-        <translation>Поздравляем! Процесс аутентификации завершен.</translation>
+        <translation type="obsolete">Поздравляем! Процесс аутентификации завершен.</translation>
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation>Вы не прошли процесс аутентификации!</translation>
+        <translation type="obsolete">Вы не прошли процесс аутентификации!</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>Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
+        <translation type="obsolete">Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Security::MultiauthMainWindow</name>
+    <message>
+        <source>Welcome to Opie Multi-authentication Framework</source>
+        <translation type="unfinished">Добро пожаловать в систему методов аутентификации Opie</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">Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</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">Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Security::SecOwnerDlg</name>
+    <message>
+        <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
+        <translation type="unfinished">Пожалуйста найдите владельца (см. ниже), или поппробуйте щелкнуть еще раз на этом экране, если вы являетесь владельцем</translation>
     </message>
 </context>
 <context>
     <name>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>Пожалуйста найдите владельца (см. ниже), или поппробуйте щелкнуть еще раз на этом экране, если вы являетесь владельцем</translation>
+        <translation type="obsolete">Пожалуйста найдите владельца (см. ниже), или поппробуйте щелкнуть еще раз на этом экране, если вы являетесь владельцем</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopieui2.ts b/i18n/ru/libopieui2.ts
index ebc8992..3908534 100644
--- a/i18n/ru/libopieui2.ts
+++ b/i18n/ru/libopieui2.ts
@@ -1,698 +1,732 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Кнопка записи</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Повернуть дисплей</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Нижний+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Нижний+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Нижний+направо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Нижний+налево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Верхний+вверх</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Верхний+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Верхний+направо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Верхний+налево</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Кнопка  ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Кнопка &quot;End&quot;</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Тон:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Насыщ.:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Красный:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зеленый:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Синий:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Альфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Выбрать цвет</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Далее</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Далее...</translation>
     </message>
 </context>
 <context>
-    <name>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>Выбрать каталог</translation>
+        <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>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Настроить ключ</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Изображение</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Ключ</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Ключ по умолчанию</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Ссылка для выбранного действия</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">&amp;Нет</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">&amp;По умолчанию</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Своя</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Настроить ключ</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">По умолчанию:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">Ключ в черном списке</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="obsolete">&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Ключ уже зарегистрирован</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="obsolete">&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторяющееся</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">неделя</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">год</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">по</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Время:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Выбрать время:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Тип 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>
+    <message>
+        <source>Select Directory</source>
+        <translation type="obsolete">Выбрать каталог</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Имя:</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>Настроить ключ</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation>Изображение</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Ключ по умолчанию</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Ссылка для выбранного действия</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>&amp;По умолчанию</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Своя</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Настроить ключ</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Ключ в черном списке</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>&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Ключ уже зарегистрирован</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>&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</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>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Приоритет:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Прогресс:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Предел:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Категория:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail по умолчанию:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Офис:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Раб. телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Раб. факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Раб. моб.:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Раб. пейджер:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Дом. тел.:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Дом. факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Дом. моб.:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Все Email:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Годовщина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Дети:</translation>
     </message>
     <message>
diff --git a/i18n/ru/libwlan.ts b/i18n/ru/libwlan.ts
index 292390e..daf795f 100644
--- a/i18n/ru/libwlan.ts
+++ b/i18n/ru/libwlan.ts
@@ -1,148 +1,293 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Конфигурация радиосети</translation>
+        <translation type="obsolete">Конфигурация радиосети</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Общие</translation>
+        <translation type="obsolete">Общие</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Режим</translation>
+        <translation type="obsolete">Режим</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Указать &amp;Точку доступа</translation>
+        <translation type="obsolete">Указать &amp;Точку доступа</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>Указать &amp;Канал</translation>
+        <translation type="obsolete">Указать &amp;Канал</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>любой</translation>
+        <translation type="obsolete">любой</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Инфраструктура</translation>
+        <translation type="obsolete">Инфраструктура</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Авто</translation>
+        <translation type="obsolete">Авто</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Управляемый</translation>
+        <translation type="obsolete">Управляемый</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Равноправный</translation>
+        <translation type="obsolete">Равноправный</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Шифрование</translation>
+        <translation type="obsolete">Шифрование</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Включить шифрование</translation>
+        <translation type="obsolete">&amp;Включить шифрование</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Настройка ключей</translation>
+        <translation type="obsolete">&amp;Настройка ключей</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Ключ &amp;1</translation>
+        <translation type="obsolete">Ключ &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Ключ &amp;2</translation>
+        <translation type="obsolete">Ключ &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Ключ &amp;3</translation>
+        <translation type="obsolete">Ключ &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Ключ &amp;4</translation>
+        <translation type="obsolete">Ключ &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Незашифрованные пакеты</translation>
+        <translation type="obsolete">Незашифрованные пакеты</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Принимать</translation>
+        <translation type="obsolete">&amp;Принимать</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Отвергать</translation>
+        <translation type="obsolete">&amp;Отвергать</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Просканировать окрестности</translation>
+        <translation type="obsolete">Просканировать окрестности</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Кнл</translation>
+        <translation type="obsolete">Кнл</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Общие</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Авто</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Управляемый</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Равноправный</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Режим</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Шифрование</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Включить шифрование</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">&amp;Настройка ключей</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Ключ &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Ключ &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Ключ &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Ключ &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">Точка доступа</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Скорость</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">Канал</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Станция</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Шум</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Качество</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Сигнал</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Информация интерфейса</translation>
+        <translation type="obsolete">Информация интерфейса</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Канал</translation>
+        <translation type="obsolete">Канал</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Режим</translation>
+        <translation type="obsolete">Режим</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Станция</translation>
+        <translation type="obsolete">Станция</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>Точка доступа</translation>
+        <translation type="obsolete">Точка доступа</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Скорость</translation>
+        <translation type="obsolete">Скорость</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Качество</translation>
+        <translation type="obsolete">Качество</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Шум</translation>
+        <translation type="obsolete">Шум</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Сигнал</translation>
+        <translation type="obsolete">Сигнал</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/minesweep.ts b/i18n/ru/minesweep.ts
index 4d07a7f..68905e7 100644
--- a/i18n/ru/minesweep.ts
+++ b/i18n/ru/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/ru/opiemail.ts b/i18n/ru/opiemail.ts
index b93ef24..8b66a59 100644
--- a/i18n/ru/opiemail.ts
+++ b/i18n/ru/opiemail.ts
@@ -1,690 +1,809 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Ошибка создания новой папки</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Ошибка во время создания&lt;br&gt;новой папки - останавливаю.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>В адресной книге нет записей.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы должны выбрать хотя бы один адрес.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation>Выбор адреса</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Problem</source>
         <translation>Проблема</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста сначала создайте SMTP запись.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста выберите файл.&lt;/p&gt;</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>Написать письмо</translation>
     </message>
     <message>
         <source>send later</source>
         <translation>отправить позже</translation>
     </message>
     <message>
         <source>use:</source>
         <translation>использовать:</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Обр. адрес</translation>
     </message>
     <message>
         <source>BCC</source>
         <translation>BCC</translation>
     </message>
     <message>
         <source>Signature</source>
         <translation>Подпись</translation>
     </message>
     <message>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Вложение</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Добавить файл</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Вопрос</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить выбранную учетную запись?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста выберите учетную запись.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation>Настроить учетные записи</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
         <source>News</source>
         <translation>Новости</translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Настроить IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Исп. SSL</translation>
+        <translation type="obsolete">Исп. SSL</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation>Префикс</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>Почта</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Создать новое сообщение</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Отослать письма из очереди</translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation>Показать/скрыть папки</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation>Изменить настройки</translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation>Настроить учетные записи</translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation>Почтовый ящик</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation>Отправитель</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</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>Настроить NNTP</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Исп. SSL</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Исп. регистрацию</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>Введите имя папки</translation>
     </message>
     <message>
         <source>Directory name:</source>
         <translation>Имя папки:</translation>
     </message>
     <message>
         <source>Directory contains other subdirs</source>
         <translation>Папка содержит другие подпапки</translation>
     </message>
 </context>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation>Вся очередь писем отправлена</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить это сообщение? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation>Прочитать это сообщение</translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation>Удалить это сообщение</translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation>Скопировать/переместить это сообщение</translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation>Ошибка создания новой папки</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Ошибка во время создания&lt;br&gt;новой папки - останавливаю.&lt;/center&gt;</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>Настроить POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Использовать защищенные сокеты:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation>ssh $SERVER exec imapd</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Настроить SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation>Исп. SSL</translation>
+        <translation type="obsolete">Исп. SSL</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Исп. регистрацию</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Имя SMTP сервера</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation>Порт SMTP сервера</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</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>Выберите тип</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Выберите тип учетной записи</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>POP3</source>
         <translation>POP3</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation>Диалог настроек</translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation>Просмотреть почту</translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation>Просмотреть почту как HTML</translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation>Создать сообщение</translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation>Отправить почту позже ( очередь в папке &quot;исходящие&quot; )</translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation>Апплет на панели</translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation>Запретить апплет на панели</translation>
     </message>
     <message>
         <source> min</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation>Как часто проверять</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Зажигать светодиод когда есть новая почта</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Проигрывать звук когда есть новая почта</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation>Форма1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>ТекстМетка1</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Показать текст</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Сохранить вложение</translation>
     </message>
     <message>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;Тело сообщения еще не скачано, так что вы еще не можете ответить.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;Тело сообщения еще не скачано, так что вы еще не можете переслать.</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить это сообщение? &lt;br&gt;&lt;br&gt;</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>E-Mail от %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Ответить</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Переслать</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Вложения</translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation>Показать HTML</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Удалить сообщение</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</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>Выберите целевой ящик</translation>
     </message>
     <message>
         <source>&lt;b&gt;Store mail(s) to&lt;/b&gt;</source>
         <translation>&lt;b&gt;Хранить почту в&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Folder:</source>
         <translation>Папка:</translation>
     </message>
     <message>
         <source>Account:</source>
         <translation>Учетная запись:</translation>
     </message>
     <message>
         <source>Create new folder</source>
         <translation>Создать новую папку</translation>
     </message>
     <message>
         <source>Prefix will prepend, no need to enter it!</source>
         <translation>Префикс будет добавлен, не нужно его вводить!</translation>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation>Переместить почту</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/qpe.ts b/i18n/ru/qpe.ts
index d0be2a4..b5dc0f3 100644
--- a/i18n/ru/qpe.ts
+++ b/i18n/ru/qpe.ts
@@ -1,308 +1,308 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Время и Дата</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Персональная Информация</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>ДокВкладка</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Проблема</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&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>&lt;p&gt;Вы хотите прервать работу программы?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Быстрая загрузка запрещена для этой программы. Нажмите и удерживайте иконку программы, чтобы разрешить ее.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; прервано сигналом %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Программа прервана</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Программа не найдена</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Нажмите на цели твердо и аккуратно
 чтобы откалибровать ваш экран.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добро пожаловать в Opie</translation>
+        <translation type="obsolete">Добро пожаловать в Opie</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Аккумулятор</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Аккумулятор разряжен</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Предыд.</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>След. &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Коснитесь экрана для продолжения.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Подождите, загружаю установки %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Подождите...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>ФонПервогоИспользования</translation>
+        <translation type="obsolete">ФонПервогоИспользования</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Завершено</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Юникод</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Запуск</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Запуск</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Нет программы</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt; Нет заданной программы для документа.&lt;p&gt; Тип %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Просмотреть как текст</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Поиск Документов...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Пиктограммы</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Список</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Вкладка Документы&lt;p&gt;запрещена.&lt;p&gt;Загляните в Настройки-&gt;Запуск-&gt;ДокВкладка&lt;p&gt;чтобы снова разрешить ее.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Все типы</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Обнаружено новое устройство:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Что мне с ним делать?</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Настроить это устройство. Изменения будут применены после завершения приложения. Чтобы обновить вкладку &quot;Документы&quot;, необходимо выдвинуть и снова вставить это устройство.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Какие типы файлов</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Изображения</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Ограничить поиск:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Убрать</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Просканировать все устройство</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Всегда проверять это устройство</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный режим</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Управление плагинами...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Перезагрузить Otopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Помощь...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Системная дата не похожа на правильную.
 (%1)&lt;/p&gt;&lt;p&gt;Скорректировать время?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Аккумулятор сел совсем!
 Выключите питание до тех пор,
 пока заряд не восстановится!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Аккумулятор разряжен.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Запасной аккумулятор разряжен.
 Зарядите запасной аккумулятор.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Бизнес-карта</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный Режим</translation>
     </message>
diff --git a/i18n/ru/sysinfo.ts b/i18n/ru/sysinfo.ts
index a55ad1f..9cda6c3 100644
--- a/i18n/ru/sysinfo.ts
+++ b/i18n/ru/sysinfo.ts
@@ -1,259 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation>Эта вкладка показывает доступные тесты, их результаты, и данные для сравнения их с выбранным устройством. Отметьте галочки напротив тестов, которые вы хотите провести.</translation>
     </message>
     <message>
         <source>Tests</source>
         <translation>Тесты</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Результаты</translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation>Сравнение</translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation>1. Целые числа  </translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation>2. Сопроцессор  </translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation>3. Вывод текста  </translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation>4. Вывод графики  </translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation>5. Производительность ОЗУ  </translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation>6. Производительность SD карты  </translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation>7. Производительность CF карты  </translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation>&amp;Начать тесты!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Нажмите здесь чтобы начать выбранные тесты.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Выберите модель для сравнения результатов.</translation>
     </message>
     <message>
         <source>Compare To:</source>
-        <translation>Сравнить с:</translation>
+        <translation type="obsolete">Сравнить с:</translation>
     </message>
     <message>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
+    <message>
+        <source>Compare:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>График показывает использование памяти на комакт-флэш карте.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>График показывает использование места на жестком диске.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>График показывает использование памяти на SD-карте.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>В</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>График показывает использование встроенной памяти (флэш-памяти) данного устройства.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>График показывает использование виртуального диска.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Процессор ( программы ),%</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Процессор ( система ), %</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Страница отображает использование процессора.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Используется (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Буфер (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кэш (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Свободно (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Всего памяти: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">Эта вкладка показывает как память(т.е. RAM) распределена на вашем устройстве.
 Память разделена на следующие категории:
 
 1. Занято - память используемая Opie и открытыми приложениями.
 2. Буфера - временное хранение для увеличения производительности.
 3. Кэш - информация которая была недавно использована, но еще не освобождена.
 4. Свободная - память не используемая Opie или открытыми приложениями.</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Эта вкладка показывает как память(т.е. RAM) распределена на вашем устройстве.
 Память разделена на следующие категории:
 
 1. Занято - память используемая Opie и открытыми приложениями.
 2. Буфера - временное хранение для увеличения производительности.
 3. Кэш - информация которая была недавно использована, но еще не освобождена.
 4. Свободная - память не используемая Opie или открытыми приложениями.</translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation>Подкачки: %1 кбайт</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модуль</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Исп.#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Список модулей, загруженных в данное время.
 
 Нажмите и удерживайте модуль, чтобы получить дополнительную инф. или выгрузить его.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Выберите команду и щелкните &quot;Послать&quot;, чтобы послать команду выбранному модулю.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Послать</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Щелкните для того, чтобы послать команду выделенному модулю.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Детальная информация о данном модуле.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Используется</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">Вы действительно хотите выполнить %1 для этого модуля?</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Вы действительно хотите выполнить
 %1 для этого модуля?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Исп. (%1 кбайт)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Доступно (%1 кбайт)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 кбайт</translation>
diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index d6fcac5..ea72583 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -17,413 +17,395 @@
         <translation>Berem nastavitve...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Odstrani
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Naloži
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Nadgradi
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Ponovno naloži)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Nadgradi)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Prostor na voljo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začni</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uporabnik je kliknil PREKINI ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces prekinjen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Shrani izhod</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Prisili odvisne</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Prisili ponovno nalaganje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Prisili odstranjevanje</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Prisili prepis</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Stopnja informiranosti</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Samo napake</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalna sporočila</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informativna sporočila</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problematičen izhod</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 - Paketni upravljalnik</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tu vpišite besedilo za iskanje.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknite tu, da skrijete Hitroskočno orodno vrstico.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Posodobi sezname</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Nadgradi</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uveljavi spremembe</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Prikaži pakete, ki niso naloženi</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Kliknite tu, da prikažem nenaložene pakete, ki so na voljo.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Prikaži naložene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Prikaži posodobljene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi in imajo na voljo novejšo različico.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter po kategoriji</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Kliknite tu, da prikažem pakete, ki pripadajo eni kategoriji.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Nastavi filter kategorije</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Kliknite tu, da zamenjate kategorijo paketa za uporabljen filter.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Najdi naslednjo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Kliknite tu, da najdete naslednje ime paketa, ki vsebuje iskano besedilo.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Hitroskočne smerne tipke</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kliknite tu, da prikažem/skrijem smerne tipke, da se lažje premikate po paketnem seznamu.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Kliknite tu, da spremenite nastavitve temu programu.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Kliknite tu, da skijem iskalno orodno vrstico.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Strežniki:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Kliknite tu, da izberete paketni vir.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paketi</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>To je seznam vseh paketev iz strežniškega vira izbranega zgoraj.
 
 Modra pika pri imenu paketa pove, da je paket trenutno nameščen.
 
 Modra pika z zvezdico pove, da je novejša različica paketa na voljo iz strežniškega vira.
 
 Kliknite v škatlico levo od pakete, da le tega izberete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Kliknite tu, da odstranite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam strežnikov:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam paketov za:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Osvežujem strežniški seznam paketov</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
diff --git a/i18n/sl/backup.ts b/i18n/sl/backup.ts
index 310a74e..dda5bdc 100644
--- a/i18n/sl/backup.ts
+++ b/i18n/sl/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Kopiraj in restavriraj... delam...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programi</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Shrani na</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiraj</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restavriraj</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Izberi vir</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Stolpec 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restavriraj</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/sl/calibrate.ts b/i18n/sl/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/sl/calibrate.ts
+++ b/i18n/sl/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/sl/fifteen.ts b/i18n/sl/fifteen.ts
index 9a9c76f..e2d5d44 100644
--- a/i18n/sl/fifteen.ts
+++ b/i18n/sl/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>Zmešaj</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">Reši</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Petnjast kosov</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Petnajst kosov</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Čestitam!
 Zmagali ste igro!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Z&amp;mešaj kose</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>&amp;Uredi kose</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/language.ts b/i18n/sl/language.ts
index 41c148c..592fe8e 100644
--- a/i18n/sl/language.ts
+++ b/i18n/sl/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Angleško</translation>
     </message>
     <message>
         <source>default</source>
         <translation>privzeto</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>Select language</source>
         <translation>Izberi jezik</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Nastavitve jezika</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libaboutapplet.ts b/i18n/sl/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/sl/libaboutapplet.ts
+++ b/i18n/sl/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/sl/libcardmonapplet.ts b/i18n/sl/libcardmonapplet.ts
index c9684b2..9aa016d 100644
--- a/i18n/sl/libcardmonapplet.ts
+++ b/i18n/sl/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>Ne morem izvreči CF/PCMCIA kartice!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>Ne morem izvreči SD/MMC kartice!</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>Nova kartica:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>Vstavljeno:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>Vstavite SD/MMC kartico</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>Vstavite kartico 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>Vstavite kartico 1: %1</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/sl/libmailwrapper.ts b/i18n/sl/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/sl/libmailwrapper.ts
+++ b/i18n/sl/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/sl/libopiesecurity2.ts b/i18n/sl/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/sl/libopiesecurity2.ts
+++ b/i18n/sl/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/sl/libopieui2.ts b/i18n/sl/libopieui2.ts
index b0144db..c800f61 100644
--- a/i18n/sl/libopieui2.ts
+++ b/i18n/sl/libopieui2.ts
@@ -1,214 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Ponavljajoč dogodek
 </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Vasak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Pogostost</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Konča na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">Tedenskaspremenljivka</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dan</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Vsak</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izberi čas:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
diff --git a/i18n/sl/libwlan.ts b/i18n/sl/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/sl/libwlan.ts
+++ b/i18n/sl/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/sl/minesweep.ts b/i18n/sl/minesweep.ts
index 8ba4bee..d1e42d5 100644
--- a/i18n/sl/minesweep.ts
+++ b/i18n/sl/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Zmagali ste!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Eksplodirali ste!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Minolovec</translation>
+        <translation type="obsolete">Minolovec</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Začetnik</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napreden</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Strokovnjak</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/opiemail.ts b/i18n/sl/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/sl/opiemail.ts
+++ b/i18n/sl/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 358d44e..990566b 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/sl/sysinfo.ts b/i18n/sl/sysinfo.ts
index f70fcd6..45dea86 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uporaba CPE v aplikacijah (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uporaba CPE v sistemu (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Medpomnilniki (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Predpomneno (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Prosto (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Skupen spomin: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uporabi#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Uporablja ga</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Na voljo (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Ukaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
diff --git a/i18n/xx/aqpkg.ts b/i18n/xx/aqpkg.ts
index 915fde1..ef6a66e 100644
--- a/i18n/xx/aqpkg.ts
+++ b/i18n/xx/aqpkg.ts
@@ -14,413 +14,427 @@
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>package - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>FOO</translation>
diff --git a/i18n/xx/backup.ts b/i18n/xx/backup.ts
index 3af5d1e..aa3cf41 100644
--- a/i18n/xx/backup.ts
+++ b/i18n/xx/backup.ts
@@ -1,124 +1,144 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/calibrate.ts b/i18n/xx/calibrate.ts
index 4aedc35..3e30b62 100644
--- a/i18n/xx/calibrate.ts
+++ b/i18n/xx/calibrate.ts
@@ -1,14 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/fifteen.ts b/i18n/xx/fifteen.ts
index ac75288..e73fa2b 100644
--- a/i18n/xx/fifteen.ts
+++ b/i18n/xx/fifteen.ts
@@ -1,41 +1,99 @@
 <!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>FOO</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/language.ts b/i18n/xx/language.ts
index 422502d..549997c 100644
--- a/i18n/xx/language.ts
+++ b/i18n/xx/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>default</source>
         <translation>FOO</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>Select language</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libaboutapplet.ts b/i18n/xx/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/xx/libaboutapplet.ts
+++ b/i18n/xx/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/xx/libcardmonapplet.ts b/i18n/xx/libcardmonapplet.ts
index df7dd25..96b99df 100644
--- a/i18n/xx/libcardmonapplet.ts
+++ b/i18n/xx/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New card: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>FOO</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/xx/libmailwrapper.ts b/i18n/xx/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/xx/libmailwrapper.ts
+++ b/i18n/xx/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
index eec00db..d9debef 100644
--- a/i18n/xx/libopiepim2.ts
+++ b/i18n/xx/libopiepim2.ts
@@ -1,374 +1,344 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">FOO</translation>
@@ -436,384 +406,414 @@ and </source>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">FOO</translation>
diff --git a/i18n/xx/libopiesecurity2.ts b/i18n/xx/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/xx/libopiesecurity2.ts
+++ b/i18n/xx/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/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
index 0bf4f64..93d0c23 100644
--- a/i18n/xx/libopieui2.ts
+++ b/i18n/xx/libopieui2.ts
@@ -1,646 +1,676 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>FOO</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">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">FOO</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">FOO</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/libwlan.ts b/i18n/xx/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/xx/libwlan.ts
+++ b/i18n/xx/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/xx/minesweep.ts b/i18n/xx/minesweep.ts
index 5cc8e5a..60a4510 100644
--- a/i18n/xx/minesweep.ts
+++ b/i18n/xx/minesweep.ts
@@ -1,33 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/opiemail.ts b/i18n/xx/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/xx/opiemail.ts
+++ b/i18n/xx/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 6b5cc09..1f3d04f 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,369 +1,365 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">FOO</translation>
     </message>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index 36345c4..86edab2 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
diff --git a/i18n/zh_CN/aqpkg.ts b/i18n/zh_CN/aqpkg.ts
index 85e0a63..cb2a1e0 100644
--- a/i18n/zh_CN/aqpkg.ts
+++ b/i18n/zh_CN/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/zh_CN/backup.ts b/i18n/zh_CN/backup.ts
index 1f2ebda..75e23eb 100644
--- a/i18n/zh_CN/backup.ts
+++ b/i18n/zh_CN/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></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/zh_CN/calibrate.ts b/i18n/zh_CN/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/zh_CN/calibrate.ts
+++ b/i18n/zh_CN/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/clock.ts b/i18n/zh_CN/clock.ts
index 6ddbc2c..401926f 100644
--- a/i18n/zh_CN/clock.ts
+++ b/i18n/zh_CN/clock.ts
@@ -14,196 +14,193 @@
         <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>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-</context>
 </TS>
diff --git a/i18n/zh_CN/fifteen.ts b/i18n/zh_CN/fifteen.ts
index 2b62ab6..7bfac7f 100644
--- a/i18n/zh_CN/fifteen.ts
+++ b/i18n/zh_CN/fifteen.ts
@@ -1,37 +1,95 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/language.ts b/i18n/zh_CN/language.ts
index 34e0346..1562400 100644
--- a/i18n/zh_CN/language.ts
+++ b/i18n/zh_CN/language.ts
@@ -1,24 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>default</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libaboutapplet.ts b/i18n/zh_CN/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/zh_CN/libaboutapplet.ts
+++ b/i18n/zh_CN/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/zh_CN/libcardmonapplet.ts b/i18n/zh_CN/libcardmonapplet.ts
index 37329c3..3637f01 100644
--- a/i18n/zh_CN/libcardmonapplet.ts
+++ b/i18n/zh_CN/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>Eject SD/MMC card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation type="unfinished"></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/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
index 410b29e..a60e040 100644
--- a/i18n/zh_CN/libliquid.ts
+++ b/i18n/zh_CN/libliquid.ts
@@ -1,68 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libmailwrapper.ts b/i18n/zh_CN/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/zh_CN/libmailwrapper.ts
+++ b/i18n/zh_CN/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/zh_CN/libopiesecurity2.ts b/i18n/zh_CN/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/zh_CN/libopiesecurity2.ts
+++ b/i18n/zh_CN/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/zh_CN/libopieui2.ts b/i18n/zh_CN/libopieui2.ts
index a40cb08..51a5983 100644
--- a/i18n/zh_CN/libopieui2.ts
+++ b/i18n/zh_CN/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libwlan.ts b/i18n/zh_CN/libwlan.ts
index d7985ab..37fdc29 100644
--- a/i18n/zh_CN/libwlan.ts
+++ b/i18n/zh_CN/libwlan.ts
@@ -1,148 +1,153 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AWLan</name>
     <message>
-        <source>any</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>SSID</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MAC</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</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;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</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/zh_CN/minesweep.ts b/i18n/zh_CN/minesweep.ts
index 1dd7e7f..9b67811 100644
--- a/i18n/zh_CN/minesweep.ts
+++ b/i18n/zh_CN/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/opiemail.ts b/i18n/zh_CN/opiemail.ts
index 694fb6c..242ccfc 100644
--- a/i18n/zh_CN/opiemail.ts
+++ b/i18n/zh_CN/opiemail.ts
@@ -1,690 +1,801 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
 </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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/qpe.ts b/i18n/zh_CN/qpe.ts
index e7d6c07..bfab94d 100644
--- a/i18n/zh_CN/qpe.ts
+++ b/i18n/zh_CN/qpe.ts
@@ -1,309 +1,301 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>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"></translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
index 4f105ad..584fa09 100644
--- a/i18n/zh_CN/security.ts
+++ b/i18n/zh_CN/security.ts
@@ -1,242 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debug options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow to bypass authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note: the third option implies the second one</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-</context>
-<context>
-    <name>SecurityBase</name>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sysinfo.ts b/i18n/zh_CN/sysinfo.ts
index d021c96..1af3e2d 100644
--- a/i18n/zh_CN/sysinfo.ts
+++ b/i18n/zh_CN/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/aqpkg.ts b/i18n/zh_TW/aqpkg.ts
index 692fd63..9a02da1 100644
--- a/i18n/zh_TW/aqpkg.ts
+++ b/i18n/zh_TW/aqpkg.ts
@@ -13,413 +13,395 @@
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>正在讀取設定...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;O確定</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;C取消</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished">目的檔</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">可使用空間</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">輸出</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">開始</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">Force Depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">Force Reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">Force Remove</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">Force Overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>更新  List</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>執行變更</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>尋找下一個</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation>瀏覽</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>伺服器:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>套件</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index 4000418..28a9c66 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,116 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>備份與還原...執行中...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>備份</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>應用程式</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>儲存至</translation>
     </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>第一行</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/zh_TW/calibrate.ts b/i18n/zh_TW/calibrate.ts
index 6af2a57..999d407 100644
--- a/i18n/zh_TW/calibrate.ts
+++ b/i18n/zh_TW/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <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"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/fifteen.ts b/i18n/zh_TW/fifteen.ts
index ec95163..d8e5cac 100644
--- a/i18n/zh_TW/fifteen.ts
+++ b/i18n/zh_TW/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;A)</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>重設位置(&amp;R)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index 2412cf4..b290bc7 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/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>Select language</source>
         <translation>選擇語言</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libaboutapplet.ts b/i18n/zh_TW/libaboutapplet.ts
index 0fdcb94..7c1517c 100644
--- a/i18n/zh_TW/libaboutapplet.ts
+++ b/i18n/zh_TW/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/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 83e93f0..28c4368 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -1,41 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <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>Eject SD/MMC card</source>
         <translation>移除 SD/MMC card</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>移除 card 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>移除 card 1: %1</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/zh_TW/libmailwrapper.ts b/i18n/zh_TW/libmailwrapper.ts
index 16104e1..0084dfc 100644
--- a/i18n/zh_TW/libmailwrapper.ts
+++ b/i18n/zh_TW/libmailwrapper.ts
@@ -1,246 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IMAPwrapper</name>
     <message>
         <source>error connecting imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error logging in imap server: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has no mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox has %1 mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error fetching headers: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error init folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error writing to message folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error initializing mbox</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>Mailbox doesn&apos;t exist.</source>
         <translation type="unfinished"></translation>
     </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>
 <context>
     <name>SMTPwrapper</name>
     <message>
         <source>No error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unexpected error code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Service not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stream error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gethostname() failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, action not taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data exceeds storage allocation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error in processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox name not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bad command sequence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User not local</source>
         <translation type="unfinished"></translation>
     </message>
     <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/zh_TW/libopiesecurity2.ts b/i18n/zh_TW/libopiesecurity2.ts
index 3249099..c711687 100644
--- a/i18n/zh_TW/libopiesecurity2.ts
+++ b/i18n/zh_TW/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/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index 80f30f5..9f50322 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,214 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Repeating Event</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">無</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">月份</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">年份</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">重復的</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">每</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Day</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>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</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"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
index 783fa2a..37fdc29 100644
--- a/i18n/zh_TW/libwlan.ts
+++ b/i18n/zh_TW/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/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index 8f00160..d8ed5ac 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/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/zh_TW/opiemail.ts b/i18n/zh_TW/opiemail.ts
index b8ab1cb..3aaf7e4 100644
--- a/i18n/zh_TW/opiemail.ts
+++ b/i18n/zh_TW/opiemail.ts
@@ -1,1033 +1,1144 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Reply</source>
         <translation type="obsolete">回覆</translation>
     </message>
     <message>
         <source>Reply All</source>
         <translation type="obsolete">回覆給所有人</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">刪除</translation>
     </message>
 </context>
 <context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPickerUI</name>
     <message>
         <source>Address Picker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
 </context>
 <context>
     <name>ComposeMail</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">名稱</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please create an SMTP account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sending mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>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>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">收件者</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BCC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="unfinished">副本</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Form1</source>
         <translation type="obsolete">表單1</translation>
     </message>
     <message>
         <source>CC</source>
         <translation type="obsolete">副本</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="obsolete">主旨</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="obsolete">取消</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="obsolete">重設</translation>
     </message>
     <message>
         <source>Queue</source>
         <translation type="obsolete">佇列</translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="obsolete">傳送</translation>
     </message>
     <message>
         <source>From:</source>
         <translation type="obsolete">寄件者:</translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="obsolete">收件者:</translation>
     </message>
 </context>
 <context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete the selected Account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an account.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditAccountsUI</name>
     <message>
         <source>Configure Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">刪除</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>News</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
-        <source>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>MailviewerApp</name>
     <message>
         <source>View</source>
         <translation type="obsolete">檢視</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="obsolete">撰寫</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="obsolete">設定值</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="obsolete">郵件</translation>
     </message>
     <message>
         <source>Mailboxes</source>
         <translation type="obsolete">信件匣</translation>
     </message>
     <message>
         <source>Configure OpieMail</source>
         <translation type="obsolete">設定 Opie郵件</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished">設定值</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/Hide folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mailbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished">主旨</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="unfinished">寄件者</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
     </message>
 </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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpieMailConfig</name>
     <message>
         <source>OpieMail Config</source>
         <translation type="obsolete">Opie郵件 組態</translation>
     </message>
     <message>
         <source>Folders</source>
         <translation type="obsolete">資料夾</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="obsolete">新增(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Modify</source>
         <translation type="obsolete">修改(&amp;M)</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation type="obsolete">刪除(&amp;D)</translation>
     </message>
     <message>
         <source>Folder name</source>
         <translation type="obsolete">資料夾名稱</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation type="obsolete">身分識別</translation>
     </message>
     <message>
         <source>Transport</source>
         <translation type="obsolete">傳輸</translation>
     </message>
     <message>
         <source>Input</source>
         <translation type="obsolete">輸入</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="obsolete">名稱</translation>
     </message>
     <message>
         <source>Folder</source>
         <translation type="obsolete">資料夾</translation>
     </message>
     <message>
         <source>User</source>
         <translation type="obsolete">使用者</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">伺服器</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">通訊協定</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">輸出</translation>
     </message>
 </context>
 <context>
     <name>OpieMailConfigImpl</name>
     <message>
         <source>Delete mailbox</source>
         <translation type="obsolete">刪除信件匣</translation>
     </message>
     <message>
         <source>Delete the mailbox?
 All mails will be deleted.</source>
         <translation type="obsolete">刪除此信件匣?
 所有的郵件都會被刪除.</translation>
     </message>
 </context>
 <context>
     <name>OpieMailFolder</name>
     <message>
         <source>OpieMail Folder Config</source>
         <translation type="obsolete">Opie郵件 資料夾組態</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">描述:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">名稱:</translation>
     </message>
 </context>
 <context>
     <name>OpieMailIdenty</name>
     <message>
         <source>OpieMail Identity - Config</source>
         <translation type="obsolete">Opie郵件 身分識別 - 組態</translation>
     </message>
     <message>
         <source>Signature:</source>
         <translation type="obsolete">簽名檔:</translation>
     </message>
     <message>
         <source>Identity:</source>
         <translation type="obsolete">身分識別:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">名稱:</translation>
     </message>
     <message>
         <source>Organization:</source>
         <translation type="obsolete">組織:</translation>
     </message>
     <message>
         <source>EMail:</source>
         <translation type="obsolete">電子郵件:</translation>
     </message>
     <message>
         <source>Reply To</source>
         <translation type="obsolete">回覆給</translation>
     </message>
     <message>
         <source>Use for sending</source>
         <translation type="obsolete">用於傳送</translation>
     </message>
 </context>
 <context>
     <name>OpieMailInputConfig</name>
     <message>
         <source>OpieMailInput</source>
         <translation type="obsolete">Open郵件輸入</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">名稱:</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">伺服器:</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">通訊協定</translation>
     </message>
     <message>
         <source>Destination Folder</source>
         <translation type="obsolete">目的資料夾</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">使用者名稱:</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">密碼</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">連接埠</translation>
     </message>
     <message>
         <source>110</source>
         <translation type="obsolete">110</translation>
     </message>
     <message>
         <source>Enable intervall checking.</source>
         <translation type="obsolete">啟用郵件通知.</translation>
     </message>
     <message>
         <source>Check every:</source>
         <translation type="obsolete">檢查於每:</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="obsolete"> 分鐘</translation>
     </message>
     <message>
         <source>&amp;Delete mail from server when deleted local.</source>
         <translation type="obsolete">當刪除本機郵件時也將它從伺服器上刪除(&amp;D).</translation>
     </message>
     <message>
         <source>&amp;Keep Mail on Server</source>
         <translation type="obsolete">保留伺服器上的郵件(&amp;K)</translation>
     </message>
 </context>
 <context>
     <name>OpieMailOutputConfig</name>
     <message>
         <source>OpieMailOutPut</source>
         <translation type="obsolete">Opie郵件輸出</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">名稱:</translation>
     </message>
     <message>
         <source>Protocol</source>
         <translation type="obsolete">通訊協定</translation>
     </message>
     <message>
         <source>Server:</source>
         <translation type="obsolete">伺服器:</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">使用者名稱:</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="obsolete">密碼</translation>
     </message>
     <message>
         <source>Server requires authentication</source>
         <translation type="obsolete">伺服器需要驗證</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="obsolete">連接埠</translation>
     </message>
     <message>
         <source>25</source>
         <translation type="obsolete">25</translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished">伺服器</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">連接埠</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">密碼</translation>
     </message>
 </context>
 <context>
     <name>QMailView</name>
     <message>
         <source>Subject</source>
         <translation type="obsolete">主旨</translation>
     </message>
     <message>
         <source>To</source>
         <translation type="obsolete">收件者</translation>
     </message>
     <message>
         <source>Sender</source>
         <translation type="obsolete">寄件者</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">日期</translation>
     </message>
     <message>
         <source>(Re)edit</source>
         <translation type="obsolete">(重新)編輯</translation>
     </message>
     <message>
         <source>Copy To</source>
         <translation type="obsolete">複製到</translation>
     </message>
     <message>
         <source>Move To</source>
         <translation type="obsolete">移動到</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>
 <context>
     <name>SettingsDialogUI</name>
     <message>
         <source>Settings Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View mail as Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mails later ( enqueue in outbox )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Taskbar Applet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SplitterWidgetBase</name>
     <message>
         <source>Form1</source>
         <translation type="obsolete">表單1</translation>
     </message>
 </context>
 <context>
     <name>StatusWidgetUI</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished">表單1</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished">收件者</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display image preview</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     </message>
     <message>
         <source>Move mail(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index fe26fa3..74932d3 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,372 +1,368 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 is not responding.&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;Would you like to force the application to exit?&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>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">business card </translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">電池狀態</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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> - Launcher</source>
         <translation type="unfinished"> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">列表瀏覽</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">音效</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">所有</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">影像</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">加入</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index d0574a2..ed8d0e7 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BenchmarkInfo</name>
     <message>
         <source>This area shows the available tests, the results for which the tests have been performed, and comparison values for one selected device. Use the checkboxes to define which tests you want to perform.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comparison</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1. Integer Arithmetic  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2. Floating Point Unit  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3. Text Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4. Gfx Rendering  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5. RAM Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6. SD Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7. CF Card Performance  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start Tests!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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 type="unfinished">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished">本圖表顯示CF記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished">本圖表顯示硬碟上已使用的儲存空間</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished">本圖表顯示SD記憶卡上已使用的記憶體量</translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">本圖表顯示內建記憶體中已使用的記憶體量</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">本圖表顯示RAM disk上已使用的記憶體量</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>應用程式CPU使用率 (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>系統CPU使用率</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>型號</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>本頁顯示處理器資源消耗程度</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>緩衝區 (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>快取區 (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>剩餘 (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="obsolete">本頁顯示裝置些記憶體分配情形
 記憶體使用分類如下：
 
 1. 已使用 - 由Opie及執行的程式所佔用
 2. 緩衝區 - 用來提升系統效能的暫存區
 3. 快取區 - 最近使用過但尚未清除的資訊
 4. 剩餘 - 未被Opie或任何執行程式佔用的記憶體</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Swap: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">使用者</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>從選單中選擇指令，再點右側的「送出」鈕即可送出命令給選取的模組</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>點下此處即可送出命令給上方已選取的模組</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">您確定要執行？</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>尚餘 (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 Kb</translation>