opie-lupdate second attempt

18 files changed, 320 insertions, 124 deletions

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
@@ -157,125 +157,107 @@
 <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>
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
@@ -49,68 +49,84 @@
     <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
@@ -158,52 +158,49 @@ one day to be selected.</source>
         <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,50 +1,53 @@
 <!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>
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,168 +1,180 @@
 <!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>
@@ -175,72 +187,100 @@
     <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,70 +1,70 @@
 <!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>
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
@@ -29,96 +29,124 @@
         <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>
@@ -174,357 +202,429 @@
     </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>
@@ -567,124 +667,135 @@
     <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
@@ -27,139 +27,131 @@
     <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>
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
@@ -113,102 +113,96 @@ You can only select an actually configured user.</source>
         <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>
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
@@ -13,101 +13,101 @@
         <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>