opie-lupdate second attempt

17 files changed, 555 insertions, 102 deletions

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
@@ -194,61 +194,75 @@
         <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>
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
@@ -91,33 +91,53 @@
         <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>
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,35 +1,93 @@
 <!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>
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
@@ -218,33 +218,33 @@ of is in een onbekend formaat.</translation>
         <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,
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
@@ -42,33 +42,33 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
     </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;
@@ -79,44 +79,62 @@ Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhel
 &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
@@ -16,26 +16,18 @@
     <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
@@ -32,32 +32,36 @@
     <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>
@@ -105,32 +109,40 @@
     <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>
@@ -207,32 +219,60 @@
     <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>
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
@@ -96,47 +96,32 @@
         <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>
@@ -152,47 +137,32 @@
 <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>
@@ -614,32 +584,62 @@ and </source>
 <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>
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
@@ -96,44 +96,44 @@
         <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>
@@ -156,44 +156,44 @@
 <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>
@@ -492,39 +492,69 @@ and </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>
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
@@ -61,32 +61,60 @@
     <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>
@@ -207,58 +235,66 @@
         <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>
@@ -290,32 +326,72 @@
         <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>
@@ -327,32 +403,44 @@
     <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>
@@ -381,32 +469,44 @@
     <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>
@@ -433,33 +533,33 @@
         <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>
@@ -467,32 +567,40 @@
     <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>
@@ -599,32 +707,36 @@
     <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>
@@ -644,32 +756,39 @@
         <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>
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
@@ -77,33 +77,33 @@
     </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>
@@ -163,33 +163,33 @@ Reservebatterij opladen aub.</translation>
         <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>
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
@@ -46,38 +46,42 @@
         <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>