opie-lupdate second attempt

19 files changed, 611 insertions, 124 deletions

diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index 04a8337..fe9be8c 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -206,41 +206,55 @@
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>ipkg konnte nicoht gestartet werden</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Öffnen fehlgeschlagen: </translation>
+        <translation type="obsolete">Öffnen fehlgeschlagen: </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation>Erstellung Verzeichnis </translation>
+        <translation type="obsolete">Erstellung Verzeichnis </translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation>Verlinkung von %1 mit %2</translation>
+        <translation type="obsolete">Verlinkung von %1 mit %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation>Verlinkung von %1 mit %2 fehlgeschlage</translation>
+        <translation type="obsolete">Verlinkung von %1 mit %2 fehlgeschlage</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation>%1 gelöscht</translation>
+        <translation type="obsolete">%1 gelöscht</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation>Löschen %1 fehlgeschlagen</translation>
+        <translation type="obsolete">Löschen %1 fehlgeschlagen</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation>Gelöscht </translation>
+        <translation type="obsolete">Gelöscht </translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation>Löschen fehlgeschlagen </translation>
+        <translation type="obsolete">Löschen fehlgeschlagen </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg-link process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking failed!
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symbolic linking succeeded.
+</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index 4df9467..b8d5f8d 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -102,13 +102,33 @@
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Erneuere Dateiliste</translation>
+        <translation type="obsolete">Erneuere Dateiliste</translation>
+    </message>
+    <message>
+        <source>Locations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
diff --git a/i18n/de/calibrate.ts b/i18n/de/calibrate.ts
index e11338b..210a639 100644
--- a/i18n/de/calibrate.ts
+++ b/i18n/de/calibrate.ts
@@ -6,10 +6,10 @@
 accurately to calibrate your screen.</source>
         <translation>Berühren Sie das Kreuz so präsise wie
 möglich zum Kalibrieren des Bildschirms.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen in Opie</translation>
+        <translation type="obsolete">Willkommen in Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/fifteen.ts b/i18n/de/fifteen.ts
index 8b47951..c85cfd3 100644
--- a/i18n/de/fifteen.ts
+++ b/i18n/de/fifteen.ts
@@ -1,8 +1,62 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FifteenConfigDialog</name>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select board background</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FifteenConfigDialogBase</name>
+    <message>
+        <source>Configure Fifteen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use a Custom Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Path:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Preview:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rows:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Verwirbeln</translation>
     </message>
     <message>
@@ -14,12 +68,16 @@
         <translation>Spiel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index 73d75e3..2a00ad7 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -219,13 +219,17 @@ oder iist in einem unbekannten Format.</translation>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
diff --git a/i18n/de/language.ts b/i18n/de/language.ts
index 4ef4e3a..a332ae2 100644
--- a/i18n/de/language.ts
+++ b/i18n/de/language.ts
@@ -6,12 +6,21 @@
         <translation>Englisch</translation>
     </message>
     <message>
         <source>default</source>
         <translation>Standard</translation>
     </message>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Attention, all windows will be closed by changing the language
+without saving the Data.&lt;br&gt;&lt;br&gt;Go on?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
         <translation>Sprache auswählen</translation>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index 15f11a4..e71c175 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -52,13 +52,13 @@ Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.h
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
-        <translation>&lt;p&gt;(new line)
+        <translation type="obsolete">&lt;p&gt;(new line)
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;(new line)
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;(new line)
@@ -89,13 +89,13 @@ Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.h
         <translation type="obsolete">&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
 &lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
 &lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
-        <translation>&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
@@ -126,8 +126,26 @@ Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
 &lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
 &lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libcardmonapplet.ts b/i18n/de/libcardmonapplet.ts
index 80cfa18..6ce62c6 100644
--- a/i18n/de/libcardmonapplet.ts
+++ b/i18n/de/libcardmonapplet.ts
@@ -29,14 +29,14 @@
     <message>
         <source>Eject card 1: %1</source>
         <translation>Karte 1 auswerfen: %1</translation>
     </message>
     <message>
         <source>New card: SD/MMC</source>
-        <translation>Neue Karte: SD / MMC</translation>
+        <translation type="obsolete">Neue Karte: SD / MMC</translation>
     </message>
     <message>
         <source>Ejected: SD/MMC</source>
-        <translation>Ausgeworfen: SD / MMC</translation>
+        <translation type="obsolete">Ausgeworfen: SD / MMC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index dbf7f33..0e8b3b6 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -8,69 +8,69 @@
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Kein Durchscheinen</translation>
+        <translation type="unfinished">Kein Durchscheinen</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>getüpfelte Hintergrundfarbe</translation>
+        <translation type="unfinished">getüpfelte Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>getüpfelte Buttonfarbe</translation>
+        <translation type="unfinished">getüpfelte Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Durchscheinend getüpfelt, Hintergrundfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Durchscheinend getüpfelt, Buttonfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Benutzerdef. Durchscheinen</translation>
+        <translation type="unfinished">Benutzerdef. Durchscheinen</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menüfarbe</translation>
+        <translation type="unfinished">Menüfarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished">Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished">Transparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menütext verwenden</translation>
+        <translation type="unfinished">Schattierten Menütext verwenden</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Flache Werkzeugleistenbuttons</translation>
+        <translation type="unfinished">Flache Werkzeugleistenbuttons</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>getüpfelter Kontrast</translation>
+        <translation type="unfinished">getüpfelter Kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Hoch perfomanter Liquid-Stil von Mosfet</translation>
+        <translation type="unfinished">Hoch perfomanter Liquid-Stil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmailwrapper.ts b/i18n/de/libmailwrapper.ts
index c2c0445..88848f5 100644
--- a/i18n/de/libmailwrapper.ts
+++ b/i18n/de/libmailwrapper.ts
@@ -42,12 +42,16 @@
         <translation>Fehler beim Kopieren von Nachrichten: %1</translation>
     </message>
     <message>
         <source>error copy mail: %1</source>
         <translation>Fehler beim Kopieren einer Nachricht: %1</translation>
     </message>
+    <message>
+        <source>Server has no TLS support!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LoginDialogUI</name>
     <message>
         <source>Login</source>
         <translation>Login</translation>
@@ -115,12 +119,20 @@
         <translation>Fehler beim Löschen von Nachricht %1</translation>
     </message>
     <message>
         <source>Error retrieving status</source>
         <translation>Fehler bei der Statusermittlung</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>POP3wrapper</name>
     <message>
         <source>Mailbox contains %1 mail(s)</source>
         <translation>Mailbox enthält %1 Nachricht(en)</translation>
@@ -217,12 +229,40 @@
         <translation>Fehler beim Versenden</translation>
     </message>
     <message>
         <source>Error sending queued mail - breaking</source>
         <translation>Fehler beim Versenden der Warteschlange</translation>
     </message>
+    <message>
+        <source>Starttls not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;%1&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP connection: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error init SMTP tls: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login aborted - storing mail to localfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentification failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error sending mail: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>progressMailSend</name>
     <message>
         <source>%1 of %2 bytes send</source>
         <translation>%1 von %2 Bytes gesendet</translation>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
index b4d83e4..bc63ef5 100644
--- a/i18n/de/libopiepim2.ts
+++ b/i18n/de/libopiepim2.ts
@@ -107,27 +107,12 @@
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Dateidialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
-    </message>
-</context>
-<context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
@@ -163,27 +148,12 @@
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Wiederholendes Ereignis</translation>
     </message>
     <message>
@@ -625,12 +595,42 @@ und</translation>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Zeit auswählen:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Dateidialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Öffnen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Speichern</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Größe</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beschreibung:</translation>
     </message>
     <message>
diff --git a/i18n/de/libopiesecurity2.ts b/i18n/de/libopiesecurity2.ts
index 96fa4e4..b52d8c9 100644
--- a/i18n/de/libopiesecurity2.ts
+++ b/i18n/de/libopiesecurity2.ts
@@ -1,41 +1,75 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MultiauthMainWindow</name>
     <message>
         <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation>Willkommen zum  Opie Multi-authentication Framework</translation>
+        <translation type="obsolete">Willkommen zum  Opie Multi-authentication Framework</translation>
     </message>
     <message>
         <source>Launching authentication plugins...</source>
-        <translation>Starte Anmeldungsplugins...</translation>
+        <translation type="obsolete">Starte Anmeldungsplugins...</translation>
     </message>
     <message>
         <source>Proceed...</source>
-        <translation>Weiter...</translation>
+        <translation type="obsolete">Weiter...</translation>
     </message>
     <message>
         <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation>Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
+        <translation type="obsolete">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
     </message>
     <message>
         <source>Congratulations! Your authentication has been successful.</source>
-        <translation>Glückwunsch! Die Anmeldung war erfolgreich.</translation>
+        <translation type="obsolete">Glückwunsch! Die Anmeldung war erfolgreich.</translation>
     </message>
     <message>
         <source>You have not succeeded enough authentication steps!</source>
-        <translation>Nicht genügend Anmeldungsschritte bestanden!</translation>
+        <translation type="obsolete">Nicht genügend Anmeldungsschritte bestanden!</translation>
+    </message>
+</context>
+<context>
+    <name>Opie::Security::MultiauthMainWindow</name>
+    <message>
+        <source>Welcome to Opie Multi-authentication Framework</source>
+        <translation type="unfinished">Willkommen zum  Opie Multi-authentication Framework</translation>
+    </message>
+    <message>
+        <source>Launching authentication plugins...</source>
+        <translation type="unfinished">Starte Anmeldungsplugins...</translation>
+    </message>
+    <message>
+        <source>Proceed...</source>
+        <translation type="unfinished">Weiter...</translation>
+    </message>
+    <message>
+        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
+        <translation type="unfinished">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
+    </message>
+    <message>
+        <source>Congratulations! Your authentication has been successful.</source>
+        <translation type="unfinished">Glückwunsch! Die Anmeldung war erfolgreich.</translation>
+    </message>
+    <message>
+        <source>You have not succeeded enough authentication steps!</source>
+        <translation type="unfinished">Nicht genügend Anmeldungsschritte bestanden!</translation>
     </message>
     <message>
         <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie::Security::SecOwnerDlg</name>
+    <message>
+        <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
+        <translation type="unfinished">Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
+    </message>
+</context>
+<context>
     <name>SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
-        <translation>Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
+        <translation type="obsolete">Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
index 275afd1..0dd7406 100644
--- a/i18n/de/libopieui2.ts
+++ b/i18n/de/libopieui2.ts
@@ -107,24 +107,24 @@
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
+    <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Dateidialog</translation>
+        <translation type="unfinished">Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Öffnen</translation>
+        <translation type="unfinished">Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Speichern</translation>
+        <translation type="unfinished">Speichern</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -167,24 +167,24 @@
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFontSelector</name>
+    <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="unfinished">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+        <translation type="unfinished">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
@@ -444,19 +444,49 @@ und</translation>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Dateityp</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation type="obsolete">Dateidialog</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="obsolete">Öffnen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Speichern</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Name:</translation>
     </message>
 </context>
 <context>
+    <name>Opie::Ui::OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Stil</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Größe</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+    </message>
+</context>
+<context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/de/libwlan.ts b/i18n/de/libwlan.ts
index 3e75cdf..0558a4d 100644
--- a/i18n/de/libwlan.ts
+++ b/i18n/de/libwlan.ts
@@ -1,153 +1,298 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>Wireless Configuration</translation>
+        <translation type="obsolete">Wireless Configuration</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Allgemein</translation>
+        <translation type="obsolete">Allgemein</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>ESS-ID</source>
         <translation type="obsolete">ESS-ID</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>&amp;Accesspoint</translation>
+        <translation type="obsolete">&amp;Accesspoint</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>&amp;Channel</translation>
+        <translation type="obsolete">&amp;Channel</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>alles</translation>
+        <translation type="obsolete">alles</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastruktur</translation>
+        <translation type="obsolete">Infrastruktur</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Managed</translation>
+        <translation type="obsolete">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <translation type="obsolete">Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Verschlüsselung</translation>
+        <translation type="obsolete">&amp;Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Schlüssel</translation>
+        <translation type="obsolete">&amp;Schlüssel</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Schlüssel &amp;1</translation>
+        <translation type="obsolete">Schlüssel &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Schlüssel &amp;2</translation>
+        <translation type="obsolete">Schlüssel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Schlüssel &amp;3</translation>
+        <translation type="obsolete">Schlüssel &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Schlüssel &amp;4</translation>
+        <translation type="obsolete">Schlüssel &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Unverschlüsselte Pakete</translation>
+        <translation type="obsolete">Unverschlüsselte Pakete</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Akzeptieren</translation>
+        <translation type="obsolete">&amp;Akzeptieren</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;ZTurückweisen</translation>
+        <translation type="obsolete">&amp;ZTurückweisen</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Umgebung neu scannen</translation>
+        <translation type="obsolete">Umgebung neu scannen</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Chn</translation>
+        <translation type="obsolete">Chn</translation>
+    </message>
+</context>
+<context>
+    <name>WLanGUI</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Allgemein</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished">Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished">Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished">Modus</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished">ESS-ID</translation>
+    </message>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished">Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished">&amp;Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished">&amp;Schlüssel</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished">Schlüssel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Schlüssel &amp;4</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished">Schlüssel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished">Schlüssel &amp;3</translation>
+    </message>
+    <message>
+        <source>Accept Non-Encrypted packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished">AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished">Rate</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished">802.11b</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished">Station</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished">ESSID</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished">Störung</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished">Qualität</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished">Signal</translation>
+    </message>
+    <message>
+        <source>Live feed </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
+    <message>
+        <source>WLan Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Schnittstelleninformation</translation>
+        <translation type="obsolete">Schnittstelleninformation</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Station</translation>
+        <translation type="obsolete">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Rate</translation>
+        <translation type="obsolete">Rate</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualität</translation>
+        <translation type="obsolete">Qualität</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Störung</translation>
+        <translation type="obsolete">Störung</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signal</translation>
+        <translation type="obsolete">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/minesweep.ts b/i18n/de/minesweep.ts
index 720d49d..fea18c8 100644
--- a/i18n/de/minesweep.ts
+++ b/i18n/de/minesweep.ts
@@ -8,13 +8,13 @@
     <message>
         <source>You exploded!</source>
         <translation>Explodiert!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
-        <translation>Minenjagd</translation>
+        <translation type="obsolete">Minenjagd</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>Anfänger</translation>
     </message>
     <message>
@@ -26,8 +26,12 @@
         <translation>Experte</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
+    <message>
+        <source>Mine Sweep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/opiemail.ts b/i18n/de/opiemail.ts
index 41940e6..7465f28 100644
--- a/i18n/de/opiemail.ts
+++ b/i18n/de/opiemail.ts
@@ -87,12 +87,40 @@
         <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>
@@ -267,16 +295,12 @@
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Port</source>
         <translation type="unfinished">Port</translation>
@@ -294,12 +318,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefix</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MailviewerApp</name>
     <message>
         <source>View</source>
         <translation type="obsolete">Ansicht</translation>
@@ -378,12 +410,52 @@
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
 </context>
 <context>
+    <name>NNTPGroupsDlg</name>
+    <message>
+        <source>Subscribed newsgroups</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NNTPGroupsUI</name>
+    <message>
+        <source>newsgroupslist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newsgroups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List of groups from the server. On start, only subscribed groups are listed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Groupfilter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a filter string here.
+Then hit &quot;get newsgroup list&quot; again and only groups starting 
+with that filter will be listet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get newsgroup list from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Retrieve the list of groups from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NNTPconfigUI</name>
     <message>
         <source>Configure NNTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -415,12 +487,24 @@
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newsgroup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get newsgroup list from server</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Newmdirdlgui</name>
     <message>
         <source>Enter directory name</source>
         <translation type="unfinished"></translation>
@@ -469,12 +553,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Define a smtp account first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read this posting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit this mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpieMailConfig</name>
     <message>
         <source>OpieMail Config</source>
         <translation type="obsolete">OpieMail Einstellungen</translation>
@@ -775,16 +871,12 @@ Alle Mails werden entfernt.</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>
@@ -810,12 +902,20 @@ Alle Mails werden entfernt.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished">Benutzer</translation>
     </message>
+    <message>
+        <source>Use secure sockets:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ssh $SERVER exec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation type="unfinished"></translation>
@@ -949,12 +1049,16 @@ Alle Mails werden entfernt.</translation>
         <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>
@@ -994,12 +1098,19 @@ Alle Mails werden entfernt.</translation>
     <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>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 89f4e59..90cdb4a 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -73,13 +73,13 @@
 accurately to calibrate your screen.</source>
         <translation>Clicken Sie das Fadenkreuz genau 
 mittig um das Display zu kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen zu Opie</translation>
+        <translation type="obsolete">Willkommen zu Opie</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
@@ -111,13 +111,13 @@ mittig um das Display zu kalibrieren.</translation>
     <message>
         <source>Please wait...</source>
         <translation>Bitte warten...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
-        <translation>ErstBenutzungsHintergrund</translation>
+        <translation type="obsolete">ErstBenutzungsHintergrund</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Fertig</translation>
     </message>
 </context>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 81c38ec..8cf215c 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -370,11 +370,11 @@ Beware that all manually entered net ranges will be lost!</source>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index e4e6c8b..70f0f61 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -56,17 +56,17 @@
     </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>